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

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

Merge 4.19.245 into android-4.19-stable 



Changes in 4.19.245
	floppy: use a statically allocated error counter
	um: Cleanup syscall_handler_t definition/cast, fix warning
	Input: add bounds checking to input_set_capability()
	Input: stmfts - fix reference leak in stmfts_input_open
	crypto: stm32 - fix reference leak in stm32_crc_remove
	MIPS: lantiq: check the return value of kzalloc()
	drbd: remove usage of list iterator variable after loop
	ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame()
	nilfs2: fix lockdep warnings in page operations for btree nodes
	nilfs2: fix lockdep warnings during disk space reclamation
	ALSA: wavefront: Proper check of get_user() error
	perf: Fix sys_perf_event_open() race against self
	Fix double fget() in vhost_net_set_backend()
	PCI/PM: Avoid putting Elo i2 PCIe Ports in D3cold
	crypto: qcom-rng - fix infinite loop on requests not multiple of WORD_SZ
	drm/dp/mst: fix a possible memory leak in fetch_monitor_name()
	mmc: core: Cleanup BKOPS support
	mmc: core: Specify timeouts for BKOPS and CACHE_FLUSH for eMMC
	mmc: block: Use generic_cmd6_time when modifying INAND_CMD38_ARG_EXT_CSD
	mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch()
	net: macb: Increment rx bd head after allocating skb and buffer
	net/sched: act_pedit: sanitize shift argument before usage
	net: vmxnet3: fix possible use-after-free bugs in vmxnet3_rq_alloc_rx_buf()
	net: vmxnet3: fix possible NULL pointer dereference in vmxnet3_rq_cleanup()
	clk: at91: generated: consider range when calculating best rate
	net/qla3xxx: Fix a test in ql_reset_work()
	NFC: nci: fix sleep in atomic context bugs caused by nci_skb_alloc
	net/mlx5e: Properly block LRO when XDP is enabled
	net: af_key: add check for pfkey_broadcast in function pfkey_process
	ARM: 9196/1: spectre-bhb: enable for Cortex-A15
	ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2
	igb: skip phy status check where unavailable
	net: bridge: Clear offload_fwd_mark when passing frame up bridge interface.
	gpio: gpio-vf610: do not touch other bits when set the target bit
	gpio: mvebu/pwm: Refuse requests with inverted polarity
	perf bench numa: Address compiler error on s390
	scsi: qla2xxx: Fix missed DMA unmap for aborted commands
	mac80211: fix rx reordering with non explicit / psmp ack policy
	ethernet: tulip: fix missing pci_disable_device() on error in tulip_init_one()
	net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe()
	net: atlantic: verify hw_head_ lies within TX buffer ring
	swiotlb: fix info leak with DMA_FROM_DEVICE
	Reinstate some of "swiotlb: rework "fix info leak with DMA_FROM_DEVICE""
	afs: Fix afs_getattr() to refetch file status if callback break occurred
	Linux 4.19.245

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic56d0fb5980a3b034db32053a7e267716a5aec5e
parents 2071d2bc 06d93c33

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 244

SUBLEVEL = 245

EXTRAVERSION =

NAME = "People's Front"

arch/arm/kernel/entry-armv.S

+1 −1
Original line number Diff line number Diff line
@@ -1067,7 +1067,7 @@ vector_bhb_loop8_\name: 


	@ bhb workaround

	mov	r0, #8

3:	b	. + 4

3:	W(b)	. + 4

	subs	r0, r0, #1

	bne	3b

	dsb

arch/arm/kernel/stacktrace.c

+5 −5
Original line number Diff line number Diff line
@@ -52,17 +52,17 @@ int notrace unwind_frame(struct stackframe *frame) 
		return -EINVAL;



	frame->sp = frame->fp;

	frame->fp = *(unsigned long *)(fp);

	frame->pc = *(unsigned long *)(fp + 4);

	frame->fp = READ_ONCE_NOCHECK(*(unsigned long *)(fp));

	frame->pc = READ_ONCE_NOCHECK(*(unsigned long *)(fp + 4));

#else

	/* check current frame pointer is within bounds */

	if (fp < low + 12 || fp > high - 4)

		return -EINVAL;



	/* restore the registers from the stack frame */

	frame->fp = *(unsigned long *)(fp - 12);

	frame->sp = *(unsigned long *)(fp - 8);

	frame->pc = *(unsigned long *)(fp - 4);

	frame->fp = READ_ONCE_NOCHECK(*(unsigned long *)(fp - 12));

	frame->sp = READ_ONCE_NOCHECK(*(unsigned long *)(fp - 8));

	frame->pc = READ_ONCE_NOCHECK(*(unsigned long *)(fp - 4));

#endif



	return 0;

arch/arm/mm/proc-v7-bugs.c

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ void cpu_v7_ca15_ibe(void) 
{

	if (check_spectre_auxcr(this_cpu_ptr(&spectre_warned), BIT(0)))

		cpu_v7_spectre_v2_init();

	cpu_v7_spectre_bhb_init();

}



void cpu_v7_bugs_init(void)

arch/mips/lantiq/falcon/sysctrl.c

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ static inline void clkdev_add_sys(const char *dev, unsigned int module, 
{

	struct clk *clk = kzalloc(sizeof(struct clk), GFP_KERNEL);



	if (!clk)

		return;

	clk->cl.dev_id = dev;

	clk->cl.con_id = NULL;

	clk->cl.clk = clk;