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

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

Merge 4.9.46 into android-4.9-o 



Changes in 4.9.46
	sparc64: remove unnecessary log message
	af_key: do not use GFP_KERNEL in atomic contexts
	dccp: purge write queue in dccp_destroy_sock()
	dccp: defer ccid_hc_tx_delete() at dismantle time
	ipv4: fix NULL dereference in free_fib_info_rcu()
	net_sched/sfq: update hierarchical backlog when drop packet
	net_sched: remove warning from qdisc_hash_add
	bpf: fix bpf_trace_printk on 32 bit archs
	openvswitch: fix skb_panic due to the incorrect actions attrlen
	ptr_ring: use kmalloc_array()
	ipv4: better IP_MAX_MTU enforcement
	nfp: fix infinite loop on umapping cleanup
	sctp: fully initialize the IPv6 address in sctp_v6_to_addr()
	tipc: fix use-after-free
	ipv6: reset fn->rr_ptr when replacing route
	ipv6: repair fib6 tree in failure case
	tcp: when rearming RTO, if RTO time is in past then fire RTO ASAP
	net/mlx4_core: Enable 4K UAR if SRIOV module parameter is not enabled
	irda: do not leak initialized list.dev to userspace
	net: sched: fix NULL pointer dereference when action calls some targets
	net_sched: fix order of queue length updates in qdisc_replace()
	bpf, verifier: add additional patterns to evaluate_reg_imm_alu
	bpf: adjust verifier heuristics
	bpf, verifier: fix alu ops against map_value{, _adj} register types
	bpf: fix mixed signed/unsigned derived min/max value bounds
	bpf/verifier: fix min/max handling in BPF_SUB
	Input: trackpoint - add new trackpoint firmware ID
	Input: elan_i2c - add ELAN0602 ACPI ID to support Lenovo Yoga310
	Input: ALPS - fix two-finger scroll breakage in right side on ALPS touchpad
	KVM: s390: sthyi: fix sthyi inline assembly
	KVM: s390: sthyi: fix specification exception detection
	KVM: x86: block guest protection keys unless the host has them enabled
	ALSA: usb-audio: Add delay quirk for H650e/Jabra 550a USB headsets
	ALSA: core: Fix unexpected error at replacing user TLV
	ALSA: hda - Add stereo mic quirk for Lenovo G50-70 (17aa:3978)
	ALSA: firewire: fix NULL pointer dereference when releasing uninitialized data of iso-resource
	ARCv2: PAE40: Explicitly set MSB counterpart of SLC region ops addresses
	mm, shmem: fix handling /sys/kernel/mm/transparent_hugepage/shmem_enabled
	i2c: designware: Fix system suspend
	mm/madvise.c: fix freeing of locked page with MADV_FREE
	fork: fix incorrect fput of ->exe_file causing use-after-free
	mm/memblock.c: reversed logic in memblock_discard()
	drm: Release driver tracking before making the object available again
	drm/atomic: If the atomic check fails, return its value first
	drm: rcar-du: Fix crash in encoder failure error path
	drm: rcar-du: Fix display timing controller parameter
	drm: rcar-du: Fix H/V sync signal polarity configuration
	tracing: Call clear_boot_tracer() at lateinit_sync
	tracing: Fix kmemleak in tracing_map_array_free()
	tracing: Fix freeing of filter in create_filter() when set_str is false
	kbuild: linker script do not match C names unless LD_DEAD_CODE_DATA_ELIMINATION is configured
	cifs: Fix df output for users with quota limits
	cifs: return ENAMETOOLONG for overlong names in cifs_open()/cifs_lookup()
	nfsd: Limit end of page list when decoding NFSv4 WRITE
	ftrace: Check for null ret_stack on profile function graph entry function
	perf/core: Fix group {cpu,task} validation
	perf probe: Fix --funcs to show correct symbols for offline module
	perf/x86/intel/rapl: Make package handling more robust
	timers: Fix excessive granularity of new timers after a nohz idle
	x86/mm: Fix use-after-free of ldt_struct
	net: sunrpc: svcsock: fix NULL-pointer exception
	Revert "leds: handle suspend/resume in heartbeat trigger"
	netfilter: nat: fix src map lookup
	Bluetooth: hidp: fix possible might sleep error in hidp_session_thread
	Bluetooth: cmtp: fix possible might sleep error in cmtp_session
	Bluetooth: bnep: fix possible might sleep error in bnep_session
	Revert "android: binder: Sanity check at binder ioctl"
	binder: use group leader instead of open thread
	binder: Use wake up hint for synchronous transactions.
	ANDROID: binder: fix proc->tsk check.
	iio: imu: adis16480: Fix acceleration scale factor for adis16480
	iio: hid-sensor-trigger: Fix the race with user space powering up sensors
	staging: rtl8188eu: add RNX-N150NUB support
	Clarify (and fix) MAX_LFS_FILESIZE macros
	ntb_transport: fix qp count bug
	ntb_transport: fix bug calculating num_qps_mw
	NTB: ntb_test: fix bug printing ntb_perf results
	ntb: no sleep in ntb_async_tx_submit
	ntb: ntb_test: ensure the link is up before trying to configure the mws
	ntb: transport shouldn't disable link due to bogus values in SPADs
	ACPI: ioapic: Clear on-stack resource before using it
	ACPI / APEI: Add missing synchronize_rcu() on NOTIFY_SCI removal
	ACPI: EC: Fix regression related to wrong ECDT initialization order
	powerpc/mm: Ensure cpumask update is ordered
	Linux 4.9.46

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 4613f61a 0eed54bd

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 45

SUBLEVEL = 46

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/include/asm/cache.h

+2 −0
Original line number Diff line number Diff line
@@ -89,7 +89,9 @@ extern unsigned long perip_base, perip_end; 
#define ARC_REG_SLC_FLUSH	0x904

#define ARC_REG_SLC_INVALIDATE	0x905

#define ARC_REG_SLC_RGN_START	0x914

#define ARC_REG_SLC_RGN_START1	0x915

#define ARC_REG_SLC_RGN_END	0x916

#define ARC_REG_SLC_RGN_END1	0x917



/* Bit val in SLC_CONTROL */

#define SLC_CTRL_IM		0x040

arch/arc/mm/cache.c

+11 −2
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ noinline void slc_op(phys_addr_t paddr, unsigned long sz, const int op) 
	static DEFINE_SPINLOCK(lock);

	unsigned long flags;

	unsigned int ctrl;

	phys_addr_t end;



	spin_lock_irqsave(&lock, flags);
@@ -591,8 +592,16 @@ noinline void slc_op(phys_addr_t paddr, unsigned long sz, const int op) 
	 * END needs to be setup before START (latter triggers the operation)

	 * END can't be same as START, so add (l2_line_sz - 1) to sz

	 */

	write_aux_reg(ARC_REG_SLC_RGN_END, (paddr + sz + l2_line_sz - 1));

	write_aux_reg(ARC_REG_SLC_RGN_START, paddr);

	end = paddr + sz + l2_line_sz - 1;

	if (is_pae40_enabled())

		write_aux_reg(ARC_REG_SLC_RGN_END1, upper_32_bits(end));



	write_aux_reg(ARC_REG_SLC_RGN_END, lower_32_bits(end));



	if (is_pae40_enabled())

		write_aux_reg(ARC_REG_SLC_RGN_START1, upper_32_bits(paddr));



	write_aux_reg(ARC_REG_SLC_RGN_START, lower_32_bits(paddr));



	while (read_aux_reg(ARC_REG_SLC_CTRL) & SLC_CTRL_BUSY);

arch/powerpc/include/asm/mmu_context.h

+19 −1
Original line number Diff line number Diff line
@@ -75,9 +75,27 @@ static inline void switch_mm_irqs_off(struct mm_struct *prev, 
				      struct task_struct *tsk)

{

	/* Mark this context has been used on the new CPU */

	if (!cpumask_test_cpu(smp_processor_id(), mm_cpumask(next)))

	if (!cpumask_test_cpu(smp_processor_id(), mm_cpumask(next))) {

		cpumask_set_cpu(smp_processor_id(), mm_cpumask(next));



		/*

		 * This full barrier orders the store to the cpumask above vs

		 * a subsequent operation which allows this CPU to begin loading

		 * translations for next.

		 *

		 * When using the radix MMU that operation is the load of the

		 * MMU context id, which is then moved to SPRN_PID.

		 *

		 * For the hash MMU it is either the first load from slb_cache

		 * in switch_slb(), and/or the store of paca->mm_ctx_id in

		 * copy_mm_to_paca().

		 *

		 * On the read side the barrier is in pte_xchg(), which orders

		 * the store to the PTE vs the load of mm_cpumask.

		 */

		smp_mb();

	}



	/* 32-bit keeps track of the current PGDIR in the thread struct */

#ifdef CONFIG_PPC32

	tsk->thread.pgdir = next->pgd;

arch/powerpc/include/asm/pgtable-be-types.h

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static inline bool pte_xchg(pte_t *ptep, pte_t old, pte_t new) 
	unsigned long *p = (unsigned long *)ptep;

	__be64 prev;



	/* See comment in switch_mm_irqs_off() */

	prev = (__force __be64)__cmpxchg_u64(p, (__force unsigned long)pte_raw(old),

					     (__force unsigned long)pte_raw(new));