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

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

Merge 4.19.279 into android-4.19-stable 



Changes in 4.19.279
	ext4: fix cgroup writeback accounting with fs-layer encryption
	fs: sysfs_emit_at: Remove PAGE_SIZE alignment check
	clk: HI655X: select REGMAP instead of depending on it
	tcp: tcp_make_synack() can be called from process context
	nfc: pn533: initialize struct pn533_out_arg properly
	qed/qed_dev: guard against a possible division by zero
	net: tunnels: annotate lockless accesses to dev->needed_headroom
	net: phy: smsc: bail out in lan87xx_read_status if genphy_read_status fails
	nfc: st-nci: Fix use after free bug in ndlc_remove due to race condition
	net: usb: smsc75xx: Limit packet length to skb->len
	nvmet: avoid potential UAF in nvmet_req_complete()
	block: sunvdc: add check for mdesc_grab() returning NULL
	ipv4: Fix incorrect table ID in IOCTL path
	net: usb: smsc75xx: Move packet length check to prevent kernel panic in skb_pull
	net/iucv: Fix size of interrupt data
	ethernet: sun: add check for the mdesc_grab()
	hwmon: (adt7475) Display smoothing attributes in correct order
	hwmon: (adt7475) Fix masking of hysteresis registers
	hwmon: (xgene) Fix use after free bug in xgene_hwmon_remove due to race condition
	media: m5mols: fix off-by-one loop termination error
	mmc: atmel-mci: fix race between stop command and start of next command
	jffs2: correct logic when creating a hole in jffs2_write_begin
	ext4: fail ext4_iget if special inode unallocated
	ext4: fix task hung in ext4_xattr_delete_inode
	drm/amdkfd: Fix an illegal memory access
	sh: intc: Avoid spurious sizeof-pointer-div warning
	tracing: Check field value in hist_field_name()
	tracing: Make tracepoint lockdep check actually test something
	ftrace: Fix invalid address access in lookup_rec() when index is 0
	fbdev: stifb: Provide valid pixelclock and add fb_check_var() checks
	x86/mm: Fix use of uninitialized buffer in sme_enable()
	drm/i915: Don't use stolen memory for ring buffers with LLC
	serial: 8250_em: Fix UART port type
	HID: core: Provide new max_buffer_size attribute to over-ride the default
	HID: uhid: Over-ride the default maximum data buffer value with our own
	Linux 4.19.279

Change-Id: I588a3903d05a52088eb3d8623ed955243db55fbd
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 68e69330 30baa092

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 278

SUBLEVEL = 279

EXTRAVERSION =

NAME = "People's Front"

arch/x86/mm/mem_encrypt_identity.c

+2 −1
Original line number Diff line number Diff line
@@ -563,7 +563,8 @@ void __init sme_enable(struct boot_params *bp) 
	cmdline_ptr = (const char *)((u64)bp->hdr.cmd_line_ptr |

				     ((u64)bp->ext_cmd_line_ptr << 32));



	cmdline_find_option(cmdline_ptr, cmdline_arg, buffer, sizeof(buffer));

	if (cmdline_find_option(cmdline_ptr, cmdline_arg, buffer, sizeof(buffer)) < 0)

		return;



	if (!strncmp(buffer, cmdline_on, sizeof(buffer)))

		sme_me_mask = me_mask;

drivers/block/sunvdc.c

+2 −0
Original line number Diff line number Diff line
@@ -947,6 +947,8 @@ static int vdc_port_probe(struct vio_dev *vdev, const struct vio_device_id *id) 
	print_version();



	hp = mdesc_grab();

	if (!hp)

		return -ENODEV;



	err = -ENODEV;

	if ((vdev->dev_no << PARTITION_SHIFT) & ~(u64)MINORMASK) {

drivers/clk/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ config COMMON_CLK_RK808 
config COMMON_CLK_HI655X

	tristate "Clock driver for Hi655x" if EXPERT

	depends on (MFD_HI655X_PMIC || COMPILE_TEST)

	depends on REGMAP

	select REGMAP

	default MFD_HI655X_PMIC

	---help---

	  This driver supports the hi655x PMIC clock. This

drivers/gpu/drm/amd/amdkfd/kfd_events.c

+3 −6
Original line number Diff line number Diff line
@@ -529,16 +529,13 @@ static struct kfd_event_waiter *alloc_event_waiters(uint32_t num_events) 
	struct kfd_event_waiter *event_waiters;

	uint32_t i;



	event_waiters = kmalloc_array(num_events,

					sizeof(struct kfd_event_waiter),

	event_waiters = kcalloc(num_events, sizeof(struct kfd_event_waiter),

				GFP_KERNEL);

	if (!event_waiters)

		return NULL;



	for (i = 0; (event_waiters) && (i < num_events) ; i++) {

	for (i = 0; i < num_events; i++)

		init_wait(&event_waiters[i].wait);

		event_waiters[i].activated = false;

	}



	return event_waiters;

}