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

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

Merge 4.19.318 into android-4.19-stable 



Changes in 4.19.318
	asm-generic: Move common compat types to asm-generic/compat.h
	media: dvb: as102-fe: Fix as10x_register_addr packing
	media: dvb-usb: dib0700_devices: Add missing release_firmware()
	IB/core: Implement a limit on UMAD receive List
	drm/amd/display: Skip finding free audio for unknown engine_id
	media: dw2102: Don't translate i2c read into write
	sctp: prefer struct_size over open coded arithmetic
	firmware: dmi: Stop decoding on broken entry
	Input: ff-core - prefer struct_size over open coded arithmetic
	net: dsa: mv88e6xxx: Correct check for empty list
	media: dvb-frontends: tda18271c2dd: Remove casting during div
	media: s2255: Use refcount_t instead of atomic_t for num_channels
	media: dvb-frontends: tda10048: Fix integer overflow
	i2c: i801: Annotate apanel_addr as __ro_after_init
	powerpc/64: Set _IO_BASE to POISON_POINTER_DELTA not 0 for CONFIG_PCI=n
	orangefs: fix out-of-bounds fsid access
	powerpc/xmon: Check cpu id in commands "c#", "dp#" and "dx#"
	jffs2: Fix potential illegal address access in jffs2_free_inode
	s390/pkey: Wipe sensitive data on failure
	tcp: take care of compressed acks in tcp_add_reno_sack()
	tcp: tcp_mark_head_lost is only valid for sack-tcp
	tcp: add ece_ack flag to reno sack functions
	net: tcp better handling of reordering then loss cases
	UPSTREAM: tcp: fix DSACK undo in fast recovery to call tcp_try_to_open()
	tcp_metrics: validate source addr length
	bonding: Fix out-of-bounds read in bond_option_arp_ip_targets_set()
	selftests: fix OOM in msg_zerocopy selftest
	selftests: make order checking verbose in msg_zerocopy selftest
	inet_diag: Initialize pad field in struct inet_diag_req_v2
	nilfs2: fix inode number range checks
	nilfs2: add missing check for inode numbers on directory entries
	mm: optimize the redundant loop of mm_update_owner_next()
	Bluetooth: Fix incorrect pointer arithmatic in ext_adv_report_evt
	can: kvaser_usb: Explicitly initialize family in leafimx driver_info struct
	fsnotify: Do not generate events for O_PATH file descriptors
	Revert "mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again"
	drm/nouveau: fix null pointer dereference in nouveau_connector_get_modes
	drm/amdgpu/atomfirmware: silence UBSAN warning
	bnx2x: Fix multiple UBSAN array-index-out-of-bounds
	media: dw2102: fix a potential buffer overflow
	i2c: pnx: Fix potential deadlock warning from del_timer_sync() call in isr
	nilfs2: fix incorrect inode allocation from reserved inodes
	drm/i915: make find_fw_domain work on intel_uncore
	tcp: fix incorrect undo caused by DSACK of TLP retransmit
	net: lantiq_etop: add blank line after declaration
	net: ethernet: lantiq_etop: fix double free in detach
	ppp: reject claimed-as-LCP but actually malformed packets
	ARM: davinci: Convert comma to semicolon
	USB: serial: option: add Telit generic core-dump composition
	USB: serial: option: add Telit FN912 rmnet compositions
	USB: serial: option: add Fibocom FM350-GL
	USB: serial: option: add support for Foxconn T99W651
	USB: serial: option: add Netprisma LCUK54 series modules
	USB: serial: option: add Rolling RW350-GL variants
	USB: Add USB_QUIRK_NO_SET_INTF quirk for START BP-850k
	usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()
	USB: core: Fix duplicate endpoint bug by clearing reserved bits in the descriptor
	hpet: Support 32-bit userspace
	libceph: fix race between delayed_work() and ceph_monc_stop()
	tcp: refactor tcp_retransmit_timer()
	net: tcp: fix unexcepted socket die when snd_wnd is 0
	tcp: use signed arithmetic in tcp_rtx_probe0_timed_out()
	tcp: avoid too many retransmit packets
	SUNRPC: Fix RPC client cleaned up the freed pipefs dentries
	nilfs2: fix kernel bug on rename operation of broken directory
	i2c: rcar: bring hardware to known state when probing
	Linux 4.19.318

Change-Id: I6d2646a308c3f44976d00ee372e87568c3e40c23
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 46d5c154 18b61cc1

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 317

SUBLEVEL = 318

EXTRAVERSION =

NAME = "People's Front"

arch/arm/mach-davinci/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void davinci_pm_suspend(void) 


	/* Configure sleep count in deep sleep register */

	val = __raw_readl(pm_config.deepsleep_reg);

	val &= ~DEEPSLEEP_SLEEPCOUNT_MASK,

	val &= ~DEEPSLEEP_SLEEPCOUNT_MASK;

	val |= pm_config.sleepcount;

	__raw_writel(val, pm_config.deepsleep_reg);

arch/arm64/include/asm/compat.h

+2 −18
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <linux/sched.h>

#include <linux/sched/task_stack.h>



#include <asm-generic/compat.h>



#define COMPAT_USER_HZ		100

#ifdef __AARCH64EB__

#define COMPAT_UTS_MACHINE	"armv8b\0\0"
@@ -32,10 +34,6 @@ 
#define COMPAT_UTS_MACHINE	"armv8l\0\0"

#endif



typedef u32		compat_size_t;

typedef s32		compat_ssize_t;

typedef s32		compat_clock_t;

typedef s32		compat_pid_t;

typedef u16		__compat_uid_t;

typedef u16		__compat_gid_t;

typedef u16		__compat_uid16_t;
@@ -43,27 +41,13 @@ typedef u16 __compat_gid16_t; 
typedef u32		__compat_uid32_t;

typedef u32		__compat_gid32_t;

typedef u16		compat_mode_t;

typedef u32		compat_ino_t;

typedef u32		compat_dev_t;

typedef s32		compat_off_t;

typedef s64		compat_loff_t;

typedef s32		compat_nlink_t;

typedef u16		compat_ipc_pid_t;

typedef s32		compat_daddr_t;

typedef u32		compat_caddr_t;

typedef __kernel_fsid_t	compat_fsid_t;

typedef s32		compat_key_t;

typedef s32		compat_timer_t;



typedef s16		compat_short_t;

typedef s32		compat_int_t;

typedef s32		compat_long_t;

typedef s64		compat_s64;

typedef u16		compat_ushort_t;

typedef u32		compat_uint_t;

typedef u32		compat_ulong_t;

typedef u64		compat_u64;

typedef u32		compat_uptr_t;



struct compat_stat {

#ifdef __AARCH64EB__

arch/mips/include/asm/compat.h

+2 −20
Original line number Diff line number Diff line
@@ -9,43 +9,25 @@ 
#include <asm/page.h>

#include <asm/ptrace.h>



#include <asm-generic/compat.h>



#define COMPAT_USER_HZ		100

#define COMPAT_UTS_MACHINE	"mips\0\0\0"



typedef u32		compat_size_t;

typedef s32		compat_ssize_t;

typedef s32		compat_clock_t;

typedef s32		compat_suseconds_t;



typedef s32		compat_pid_t;

typedef s32		__compat_uid_t;

typedef s32		__compat_gid_t;

typedef __compat_uid_t	__compat_uid32_t;

typedef __compat_gid_t	__compat_gid32_t;

typedef u32		compat_mode_t;

typedef u32		compat_ino_t;

typedef u32		compat_dev_t;

typedef s32		compat_off_t;

typedef s64		compat_loff_t;

typedef u32		compat_nlink_t;

typedef s32		compat_ipc_pid_t;

typedef s32		compat_daddr_t;

typedef s32		compat_caddr_t;

typedef struct {

	s32	val[2];

} compat_fsid_t;

typedef s32		compat_timer_t;

typedef s32		compat_key_t;



typedef s16		compat_short_t;

typedef s32		compat_int_t;

typedef s32		compat_long_t;

typedef s64		compat_s64;

typedef u16		compat_ushort_t;

typedef u32		compat_uint_t;

typedef u32		compat_ulong_t;

typedef u64		compat_u64;

typedef u32		compat_uptr_t;



struct compat_stat {

	compat_dev_t	st_dev;

arch/parisc/include/asm/compat.h

+2 −16
Original line number Diff line number Diff line
@@ -8,36 +8,22 @@ 
#include <linux/sched.h>

#include <linux/thread_info.h>



#include <asm-generic/compat.h>



#define COMPAT_USER_HZ 		100

#define COMPAT_UTS_MACHINE	"parisc\0\0"



typedef u32	compat_size_t;

typedef s32	compat_ssize_t;

typedef s32	compat_clock_t;

typedef s32	compat_pid_t;

typedef u32	__compat_uid_t;

typedef u32	__compat_gid_t;

typedef u32	__compat_uid32_t;

typedef u32	__compat_gid32_t;

typedef u16	compat_mode_t;

typedef u32	compat_ino_t;

typedef u32	compat_dev_t;

typedef s32	compat_off_t;

typedef s64	compat_loff_t;

typedef u16	compat_nlink_t;

typedef u16	compat_ipc_pid_t;

typedef s32	compat_daddr_t;

typedef u32	compat_caddr_t;

typedef s32	compat_key_t;

typedef s32	compat_timer_t;



typedef s32	compat_int_t;

typedef s32	compat_long_t;

typedef s64	compat_s64;

typedef u32	compat_uint_t;

typedef u32	compat_ulong_t;

typedef u64	compat_u64;

typedef u32	compat_uptr_t;



struct compat_stat {

	compat_dev_t		st_dev;	/* dev_t is 32 bits on parisc */