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

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

Merge 4.19.240 into android-4.19-stable 



Changes in 4.19.240
	etherdevice: Adjust ether_addr* prototypes to silence -Wstringop-overead
	mm: page_alloc: fix building error on -Werror=array-compare
	tracing: Dump stacktrace trigger to the corresponding instance
	can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path
	dm integrity: fix memory corruption when tag_size is less than digest size
	gfs2: assign rgrp glock before compute_bitstructs
	ALSA: usb-audio: Clear MIDI port active flag after draining
	tcp: fix race condition when creating child sockets from syncookies
	tcp: Fix potential use-after-free due to double kfree()
	ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek
	ASoC: msm8916-wcd-digital: Check failure for devm_snd_soc_register_component
	dmaengine: imx-sdma: Fix error checking in sdma_event_remap
	rxrpc: Restore removed timer deletion
	net/packet: fix packet_sock xmit return value checking
	net/sched: cls_u32: fix possible leak in u32_init_knode()
	netlink: reset network and mac headers in netlink_dump()
	ARM: vexpress/spc: Avoid negative array index when !SMP
	reset: tegra-bpmp: Restore Handle errors in BPMP response
	platform/x86: samsung-laptop: Fix an unsigned comparison which can never be negative
	ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant
	vxlan: fix error return code in vxlan_fdb_append
	cifs: Check the IOCB_DIRECT flag, not O_DIRECT
	mt76: Fix undefined behavior due to shift overflowing the constant
	brcmfmac: sdio: Fix undefined behavior due to shift overflowing the constant
	dpaa_eth: Fix missing of_node_put in dpaa_get_ts_info()
	drm/msm/mdp5: check the return of kzalloc()
	net: macb: Restart tx only if queue pointer is lagging
	stat: fix inconsistency between struct stat and struct compat_stat
	ata: pata_marvell: Check the 'bmdma_addr' beforing reading
	dma: at_xdmac: fix a missing check on list iterator
	drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised
	drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare
	powerpc/perf: Fix power9 event alternatives
	openvswitch: fix OOB access in reserve_sfa_size()
	ASoC: soc-dapm: fix two incorrect uses of list iterator
	e1000e: Fix possible overflow in LTR decoding
	ARC: entry: fix syscall_trace_exit argument
	arm_pmu: Validate single/group leader events
	ext4: fix symlink file size not match to file content
	ext4: limit length to bitmap_maxbytes - blocksize in punch_hole
	ext4: fix overhead calculation to account for the reserved gdt blocks
	ext4: force overhead calculation if the s_overhead_cluster makes no sense
	staging: ion: Prevent incorrect reference counting behavour
	block/compat_ioctl: fix range check in BLKGETSIZE
	ax25: add refcount in ax25_dev to avoid UAF bugs
	ax25: fix reference count leaks of ax25_dev
	ax25: fix UAF bugs of net_device caused by rebinding operation
	ax25: Fix refcount leaks caused by ax25_cb_del()
	ax25: fix UAF bug in ax25_send_control()
	ax25: fix NPD bug in ax25_disconnect
	ax25: Fix NULL pointer dereferences in ax25 timers
	ax25: Fix UAF bugs in ax25 timers
	Revert "net: micrel: fix KS8851_MLL Kconfig"
	Linux 4.19.240

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I8e14eaee84f2ca2ffa54214bd3e86fa1f5ea7954
parents dbfc3fbb d54b97b3

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 239

SUBLEVEL = 240

EXTRAVERSION =

NAME = "People's Front"

arch/arc/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ tracesys_exit: 
	st  r0, [sp, PT_r0]     ; sys call return value in pt_regs



	;POST Sys Call Ptrace Hook

	mov r0, sp		; pt_regs needed

	bl  @syscall_trace_exit

	b   ret_from_exception ; NOT ret_from_system_call at is saves r0 which

	; we'd done before calling post hook above

arch/arm/mach-vexpress/spc.c

+1 −1
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ static int __init ve_spc_clk_init(void) 
		}



		cluster = topology_physical_package_id(cpu_dev->id);

		if (init_opp_table[cluster])

		if (cluster < 0 || init_opp_table[cluster])

			continue;



		if (ve_init_opp_table(cpu_dev))

arch/powerpc/perf/power9-pmu.c

+4 −4
Original line number Diff line number Diff line
@@ -143,11 +143,11 @@ int p9_dd22_bl_ev[] = { 


/* Table of alternatives, sorted by column 0 */

static const unsigned int power9_event_alternatives[][MAX_ALT] = {

	{ PM_BR_2PATH,			PM_BR_2PATH_ALT },

	{ PM_INST_DISP,			PM_INST_DISP_ALT },

	{ PM_RUN_CYC_ALT,               PM_RUN_CYC },

	{ PM_RUN_INST_CMPL_ALT,		PM_RUN_INST_CMPL },

	{ PM_LD_MISS_L1,                PM_LD_MISS_L1_ALT },

	{ PM_BR_2PATH,			PM_BR_2PATH_ALT },

	{ PM_RUN_INST_CMPL_ALT,         PM_RUN_INST_CMPL },

};



static int power9_get_alternatives(u64 event, unsigned int flags, u64 alt[])

arch/x86/include/asm/compat.h

+2 −4
Original line number Diff line number Diff line
@@ -46,15 +46,13 @@ typedef u64 __attribute__((aligned(4))) compat_u64; 
typedef u32		compat_uptr_t;



struct compat_stat {

	compat_dev_t	st_dev;

	u16		__pad1;

	u32		st_dev;

	compat_ino_t	st_ino;

	compat_mode_t	st_mode;

	compat_nlink_t	st_nlink;

	__compat_uid_t	st_uid;

	__compat_gid_t	st_gid;

	compat_dev_t	st_rdev;

	u16		__pad2;

	u32		st_rdev;

	u32		st_size;

	u32		st_blksize;

	u32		st_blocks;