Commit 9bf59048 authored Apr 30, 2019 by Greg Kroah-Hartman

Merge 4.19.37 into android-4.19



Changes in 4.19.37
	bonding: fix event handling for stacked bonds
	failover: allow name change on IFF_UP slave interfaces
	net: atm: Fix potential Spectre v1 vulnerabilities
	net: bridge: fix per-port af_packet sockets
	net: bridge: multicast: use rcu to access port list from br_multicast_start_querier
	net: Fix missing meta data in skb with vlan packet
	net: fou: do not use guehdr after iptunnel_pull_offloads in gue_udp_recv
	tcp: tcp_grow_window() needs to respect tcp_space()
	team: set slave to promisc if team is already in promisc mode
	tipc: missing entries in name table of publications
	vhost: reject zero size iova range
	ipv4: recompile ip options in ipv4_link_failure
	ipv4: ensure rcu_read_lock() in ipv4_link_failure()
	net: thunderx: raise XDP MTU to 1508
	net: thunderx: don't allow jumbo frames with XDP
	net/mlx5: FPGA, tls, hold rcu read lock a bit longer
	net/tls: prevent bad memory access in tls_is_sk_tx_device_offloaded()
	net/mlx5: FPGA, tls, idr remove on flow delete
	route: Avoid crash from dereferencing NULL rt->from
	sch_cake: Use tc_skb_protocol() helper for getting packet protocol
	sch_cake: Make sure we can write the IP header before changing DSCP bits
	nfp: flower: replace CFI with vlan present
	nfp: flower: remove vlan CFI bit from push vlan action
	sch_cake: Simplify logic in cake_select_tin()
	net: IP defrag: encapsulate rbtree defrag code into callable functions
	net: IP6 defrag: use rbtrees for IPv6 defrag
	net: IP6 defrag: use rbtrees in nf_conntrack_reasm.c
	CIFS: keep FileInfo handle live during oplock break
	cifs: Fix use-after-free in SMB2_write
	cifs: Fix use-after-free in SMB2_read
	cifs: fix handle leak in smb2_query_symlink()
	KVM: x86: Don't clear EFER during SMM transitions for 32-bit vCPU
	KVM: x86: svm: make sure NMI is injected after nmi_singlestep
	Staging: iio: meter: fixed typo
	staging: iio: ad7192: Fix ad7193 channel address
	iio: gyro: mpu3050: fix chip ID reading
	iio/gyro/bmg160: Use millidegrees for temperature scale
	iio:chemical:bme680: Fix, report temperature in millidegrees
	iio:chemical:bme680: Fix SPI read interface
	iio: cros_ec: Fix the maths for gyro scale calculation
	iio: ad_sigma_delta: select channel when reading register
	iio: dac: mcp4725: add missing powerdown bits in store eeprom
	iio: Fix scan mask selection
	iio: adc: at91: disable adc channel interrupt in timeout case
	iio: core: fix a possible circular locking dependency
	io: accel: kxcjk1013: restore the range after resume.
	staging: most: core: use device description as name
	staging: comedi: vmk80xx: Fix use of uninitialized semaphore
	staging: comedi: vmk80xx: Fix possible double-free of ->usb_rx_buf
	staging: comedi: ni_usb6501: Fix use of uninitialized mutex
	staging: comedi: ni_usb6501: Fix possible double-free of ->usb_rx_buf
	ALSA: hda/realtek - add two more pin configuration sets to quirk table
	ALSA: core: Fix card races between register and disconnect
	Input: elan_i2c - add hardware ID for multiple Lenovo laptops
	serial: sh-sci: Fix HSCIF RX sampling point adjustment
	serial: sh-sci: Fix HSCIF RX sampling point calculation
	vt: fix cursor when clearing the screen
	scsi: core: set result when the command cannot be dispatched
	Revert "scsi: fcoe: clear FC_RP_STARTED flags when receiving a LOGO"
	Revert "svm: Fix AVIC incomplete IPI emulation"
	coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping
	ipmi: fix sleep-in-atomic in free_user at cleanup SRCU user->release_barrier
	crypto: x86/poly1305 - fix overflow during partial reduction
	drm/ttm: fix out-of-bounds read in ttm_put_pages() v2
	arm64: futex: Restore oldval initialization to work around buggy compilers
	x86/kprobes: Verify stack frame on kretprobe
	kprobes: Mark ftrace mcount handler functions nokprobe
	kprobes: Fix error check when reusing optimized probes
	rt2x00: do not increment sequence number while re-transmitting
	mac80211: do not call driver wake_tx_queue op during reconfig
	drm/amdgpu/gmc9: fix VM_L2_CNTL3 programming
	perf/x86/amd: Add event map for AMD Family 17h
	x86/cpu/bugs: Use __initconst for 'const' init data
	perf/x86: Fix incorrect PEBS_REGS
	x86/speculation: Prevent deadlock on ssb_state::lock
	timers/sched_clock: Prevent generic sched_clock wrap caused by tick_freeze()
	nfit/ars: Remove ars_start_flags
	nfit/ars: Introduce scrub_flags
	nfit/ars: Allow root to busy-poll the ARS state machine
	nfit/ars: Avoid stale ARS results
	mmc: sdhci: Fix data command CRC error handling
	mmc: sdhci: Rename SDHCI_ACMD12_ERR and SDHCI_INT_ACMD12ERR
	mmc: sdhci: Handle auto-command errors
	modpost: file2alias: go back to simple devtable lookup
	modpost: file2alias: check prototype of handler
	tpm/tpm_i2c_atmel: Return -E2BIG when the transfer is incomplete
	tpm: Fix the type of the return value in calc_tpm2_event_size()
	Revert "kbuild: use -Oz instead of -Os when using clang"
	sched/fair: Limit sched_cfs_period_timer() loop to avoid hard lockup
	device_cgroup: fix RCU imbalance in error case
	mm/vmstat.c: fix /proc/vmstat format for CONFIG_DEBUG_TLBFLUSH=y CONFIG_SMP=n
	ALSA: info: Fix racy addition/deletion of nodes
	percpu: stop printing kernel addresses
	tools include: Adopt linux/bits.h
	ASoC: rockchip: add missing INTERLEAVED PCM attribute
	i2c-hid: properly terminate i2c_hid_dmi_desc_override_table[] array
	Revert "locking/lockdep: Add debug_locks check in __lock_downgrade()"
	kernel/sysctl.c: fix out-of-bounds access when setting file-max
	Linux 4.19.37

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents 052f2452 19bb613a

Makefile

+2 −3

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 36
		SUBLEVEL = 37
		EXTRAVERSION =
		NAME = "People's Front"

		@@ -658,8 +658,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)
		KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)

		ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
		KBUILD_CFLAGS += $(call cc-option,-Oz,-Os)
		KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)
		KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
		else
		ifdef CONFIG_PROFILE_ALL_BRANCHES
		KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)

arch/arm64/include/asm/futex.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ do { \
		static inline int
		arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user _uaddr)
		{
		int oldval, ret, tmp;
		int oldval = 0, ret, tmp;
		u32 __user *uaddr = __uaccess_mask_ptr(_uaddr);

		pagefault_disable();

arch/x86/crypto/poly1305-avx2-x86_64.S

+10 −4

Original line number	Diff line number	Diff line
		@@ -323,6 +323,12 @@ ENTRY(poly1305_4block_avx2)
		vpaddq t2,t1,t1
		vmovq t1x,d4

		# Now do a partial reduction mod (2^130)-5, carrying h0 -> h1 -> h2 ->
		# h3 -> h4 -> h0 -> h1 to get h0,h2,h3,h4 < 2^26 and h1 < 2^26 + a small
		# amount. Careful: we must not assume the carry bits 'd0 >> 26',
		# 'd1 >> 26', 'd2 >> 26', 'd3 >> 26', and '(d4 >> 26) * 5' fit in 32-bit
		# integers. It's true in a single-block implementation, but not here.

		# d1 += d0 >> 26
		mov d0,%rax
		shr $26,%rax
		@@ -361,16 +367,16 @@ ENTRY(poly1305_4block_avx2)
		# h0 += (d4 >> 26) * 5
		mov d4,%rax
		shr $26,%rax
		lea (%eax,%eax,4),%eax
		add %eax,%ebx
		lea (%rax,%rax,4),%rax
		add %rax,%rbx
		# h4 = d4 & 0x3ffffff
		mov d4,%rax
		and $0x3ffffff,%eax
		mov %eax,h4

		# h1 += h0 >> 26
		mov %ebx,%eax
		shr $26,%eax
		mov %rbx,%rax
		shr $26,%rax
		add %eax,h1
		# h0 = h0 & 0x3ffffff
		andl $0x3ffffff,%ebx

arch/x86/crypto/poly1305-sse2-x86_64.S

+14 −8

Original line number	Diff line number	Diff line
		@@ -253,16 +253,16 @@ ENTRY(poly1305_block_sse2)
		# h0 += (d4 >> 26) * 5
		mov d4,%rax
		shr $26,%rax
		lea (%eax,%eax,4),%eax
		add %eax,%ebx
		lea (%rax,%rax,4),%rax
		add %rax,%rbx
		# h4 = d4 & 0x3ffffff
		mov d4,%rax
		and $0x3ffffff,%eax
		mov %eax,h4

		# h1 += h0 >> 26
		mov %ebx,%eax
		shr $26,%eax
		mov %rbx,%rax
		shr $26,%rax
		add %eax,h1
		# h0 = h0 & 0x3ffffff
		andl $0x3ffffff,%ebx
		@@ -520,6 +520,12 @@ ENTRY(poly1305_2block_sse2)
		paddq t2,t1
		movq t1,d4

		# Now do a partial reduction mod (2^130)-5, carrying h0 -> h1 -> h2 ->
		# h3 -> h4 -> h0 -> h1 to get h0,h2,h3,h4 < 2^26 and h1 < 2^26 + a small
		# amount. Careful: we must not assume the carry bits 'd0 >> 26',
		# 'd1 >> 26', 'd2 >> 26', 'd3 >> 26', and '(d4 >> 26) * 5' fit in 32-bit
		# integers. It's true in a single-block implementation, but not here.

		# d1 += d0 >> 26
		mov d0,%rax
		shr $26,%rax
		@@ -558,16 +564,16 @@ ENTRY(poly1305_2block_sse2)
		# h0 += (d4 >> 26) * 5
		mov d4,%rax
		shr $26,%rax
		lea (%eax,%eax,4),%eax
		add %eax,%ebx
		lea (%rax,%rax,4),%rax
		add %rax,%rbx
		# h4 = d4 & 0x3ffffff
		mov d4,%rax
		and $0x3ffffff,%eax
		mov %eax,h4

		# h1 += h0 >> 26
		mov %ebx,%eax
		shr $26,%eax
		mov %rbx,%rax
		shr $26,%rax
		add %eax,h1
		# h0 = h0 & 0x3ffffff
		andl $0x3ffffff,%ebx

arch/x86/events/amd/core.c

+26 −9

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ static __initconst const u64 amd_hw_cache_event_ids
		};

		/*
		* AMD Performance Monitor K7 and later.
		* AMD Performance Monitor K7 and later, up to and including Family 16h:
		*/
		static const u64 amd_perfmon_event_map[PERF_COUNT_HW_MAX] =
		{
		@@ -131,8 +131,25 @@ static const u64 amd_perfmon_event_map[PERF_COUNT_HW_MAX] =
		[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 0x00d1, /* "Dispatch stalls" event */
		};

		/*
		* AMD Performance Monitor Family 17h and later:
		*/
		static const u64 amd_f17h_perfmon_event_map[PERF_COUNT_HW_MAX] =
		{
		[PERF_COUNT_HW_CPU_CYCLES] = 0x0076,
		[PERF_COUNT_HW_INSTRUCTIONS] = 0x00c0,
		[PERF_COUNT_HW_CACHE_REFERENCES] = 0xff60,
		[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = 0x00c2,
		[PERF_COUNT_HW_BRANCH_MISSES] = 0x00c3,
		[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 0x0287,
		[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 0x0187,
		};

		static u64 amd_pmu_event_map(int hw_event)
		{
		if (boot_cpu_data.x86 >= 0x17)
		return amd_f17h_perfmon_event_map[hw_event];

		return amd_perfmon_event_map[hw_event];
		}