Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de048bba authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.57 into android-3.18 



Changes in 3.18.57
	bnx2x: Fix Multi-Cos
	ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()
	cxgb4: avoid enabling napi twice to the same queue
	tcp: disallow cwnd undo when switching congestion control
	ipv6: Fix leak in ipv6_gso_segment().
	net: ping: do not abuse udp_poll()
	net: ethoc: enable NAPI before poll may be scheduled
	serial: ifx6x60: fix use-after-free on module unload
	KEYS: fix dereferencing NULL payload with nonzero length
	KEYS: fix freeing uninitialized memory in key_update()
	crypto: gcm - wait for crypto op not signal safe
	nfsd4: fix null dereference on replay
	kvm: async_pf: fix rcu_irq_enter() with irqs enabled
	KVM: cpuid: Fix read/write out-of-bounds vulnerability in cpuid emulation
	arm: KVM: Allow unaligned accesses at HYP
	dmaengine: ep93xx: Always start from BASE0
	ext4: fix SEEK_HOLE
	ext4: keep existing extra fields when inode expands
	usb: gadget: f_mass_storage: Serialize wake and sleep execution
	usb: chipidea: udc: fix NULL pointer dereference if udc_start failed
	usb: chipidea: debug: check before accessing ci_role
	staging/lustre/lov: remove set_fs() call from lov_getstripe()
	iio: proximity: as3935: fix AS3935_INT mask
	drivers: char: random: add get_random_long()
	random: properly align get_random_int_hash
	stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms
	btrfs: use correct types for page indices in btrfs_page_exists_in_range
	btrfs: fix memory leak in update_space_info failure path
	scsi: qla2xxx: don't disable a not previously enabled PCI device
	powerpc/eeh: Avoid use after free in eeh_handle_special_event()
	powerpc/numa: Fix percpu allocations to be NUMA aware
	perf/core: Drop kernel samples even though :u is specified
	drm/vmwgfx: Handle vmalloc() failure in vmw_local_fifo_reserve()
	drm/vmwgfx: limit the number of mip levels in vmw_gb_surface_define_ioctl()
	ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT
	ASoC: Fix use-after-free at card unregistration
	drivers: char: mem: Fix wraparound check to allow mappings up to the end
	serial: sh-sci: Fix panic when serial console and DMA are enabled
	arm64: hw_breakpoint: fix watchpoint matching for tagged pointers
	arm64: entry: improve data abort handling of tagged pointers
	RDMA/qib,hfi1: Fix MR reference count leak on write with immediate
	usercopy: Adjust tests to deal with SMAP/PAN
	arm64: ensure extension of smp_store_release value
	mlx5: stop including <asm-generic/kmap_types.h>
	ALSA: timer: Fix race between read and ioctl
	Linux 3.18.57

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 92520b83 83668684

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 56

SUBLEVEL = 57

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/kvm/init.S

+2 −3
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ __do_hyp_init: 
	@  - Write permission implies XN: disabled

	@  - Instruction cache: enabled

	@  - Data/Unified cache: enabled

	@  - Memory alignment checks: enabled

	@  - MMU: enabled (this code must be run from an identity mapping)

	mrc	p15, 4, r0, c1, c0, 0	@ HSCR

	ldr	r2, =HSCTLR_MASK
@@ -118,8 +117,8 @@ __do_hyp_init: 
	mrc	p15, 0, r1, c1, c0, 0	@ SCTLR

	ldr	r2, =(HSCTLR_EE | HSCTLR_FI | HSCTLR_I | HSCTLR_C)

	and	r1, r1, r2

 ARM(	ldr	r2, =(HSCTLR_M | HSCTLR_A)			)

 THUMB(	ldr	r2, =(HSCTLR_M | HSCTLR_A | HSCTLR_TE)		)

 ARM(	ldr	r2, =(HSCTLR_M)					)

 THUMB(	ldr	r2, =(HSCTLR_M | HSCTLR_TE)			)

	orr	r1, r1, r2

	orr	r0, r0, r1

	isb

arch/arm64/include/asm/asm-uaccess.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ASM_UACCESS_H

#define __ASM_ASM_UACCESS_H



/*

 * Remove the address tag from a virtual address, if present.

 */

	.macro	clear_address_tag, dst, addr

	tst	\addr, #(1 << 55)

	bic	\dst, \addr, #(0xff << 56)

	csel	\dst, \dst, \addr, eq

	.endm



#endif

arch/arm64/include/asm/barrier.h

+8 −2
Original line number Diff line number Diff line
@@ -44,15 +44,21 @@ 


#define smp_store_release(p, v)						\

do {									\

	union { typeof(*p) __val; char __c[1]; } __u =			\

		{ .__val = (__force typeof(*p)) (v) }; 			\

	compiletime_assert_atomic_type(*p);				\

	switch (sizeof(*p)) {						\

	case 4:								\

		asm volatile ("stlr %w1, %0"				\

				: "=Q" (*p) : "r" (v) : "memory");	\

				: "=Q" (*p)				\

				: "r" (*(__u32 *)__u.__c)		\

				: "memory");				\

		break;							\

	case 8:								\

		asm volatile ("stlr %1, %0"				\

				: "=Q" (*p) : "r" (v) : "memory");	\

				: "=Q" (*p)				\

				: "r" (*(__u64 *)__u.__c)		\

				: "memory");				\

		break;							\

	}								\

} while (0)

arch/arm64/include/asm/uaccess.h

+8 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
/*

 * User space memory access functions

 */

#include <linux/bitops.h>

#include <linux/string.h>

#include <linux/thread_info.h>
@@ -117,6 +118,13 @@ static inline void set_fs(mm_segment_t fs) 
	flag;								\

})



/*

 * When dealing with data aborts, watchpoints, or instruction traps we may end

 * up with a tagged userland pointer. Clear the tag to get a sane pointer to

 * pass on to access_ok(), for instance.

 */

#define untagged_addr(addr)		sign_extend64(addr, 55)



#define access_ok(type, addr, size)	__range_ok(addr, size)

#define user_addr_max			get_fs