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

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

Merge 4.19.265 into android-4.19-stable 



Changes in 4.19.265
	NFSv4.1: Handle RECLAIM_COMPLETE trunking errors
	NFSv4.1: We must always send RECLAIM_COMPLETE after a reboot
	nfs4: Fix kmemleak when allocate slot failed
	net: dsa: Fix possible memory leaks in dsa_loop_init()
	RDMA/qedr: clean up work queue on failure in qedr_alloc_resources()
	nfc: s3fwrn5: Fix potential memory leak in s3fwrn5_nci_send()
	nfc: nfcmrvl: Fix potential memory leak in nfcmrvl_i2c_nci_send()
	net: fec: fix improper use of NETDEV_TX_BUSY
	ata: pata_legacy: fix pdc20230_set_piomode()
	net: sched: Fix use after free in red_enqueue()
	net: tun: fix bugs for oversize packet when napi frags enabled
	ipvs: use explicitly signed chars
	ipvs: fix WARNING in __ip_vs_cleanup_batch()
	ipvs: fix WARNING in ip_vs_app_net_cleanup()
	rose: Fix NULL pointer dereference in rose_send_frame()
	mISDN: fix possible memory leak in mISDN_register_device()
	isdn: mISDN: netjet: fix wrong check of device registration
	btrfs: fix inode list leak during backref walking at resolve_indirect_refs()
	btrfs: fix ulist leaks in error paths of qgroup self tests
	Bluetooth: L2CAP: Fix use-after-free caused by l2cap_reassemble_sdu
	Bluetooth: L2CAP: fix use-after-free in l2cap_conn_del()
	net: mdio: fix undefined behavior in bit shift for __mdiobus_register
	net, neigh: Fix null-ptr-deref in neigh_table_clear()
	ipv6: fix WARNING in ip6_route_net_exit_late()
	media: s5p_cec: limit msg.len to CEC_MAX_MSG_SIZE
	media: cros-ec-cec: limit msg.len to CEC_MAX_MSG_SIZE
	media: dvb-frontends/drxk: initialize err to 0
	HID: saitek: add madcatz variant of MMO7 mouse device ID
	i2c: xiic: Add platform module alias
	Bluetooth: L2CAP: Fix attempting to access uninitialized memory
	block, bfq: protect 'bfqd->queued' by 'bfqd->lock'
	btrfs: fix type of parameter generation in btrfs_get_dentry
	tcp/udp: Make early_demux back namespacified.
	kprobe: reverse kp->flags when arm_kprobe failed
	tracing/histogram: Update document for KEYS_MAX size
	capabilities: fix potential memleak on error path from vfs_getxattr_alloc()
	ALSA: usb-audio: Add quirks for MacroSilicon MS2100/MS2106 devices
	efi: random: reduce seed size to 32 bytes
	parisc: Make 8250_gsc driver dependend on CONFIG_PARISC
	parisc: Export iosapic_serial_irq() symbol for serial port driver
	parisc: Avoid printing the hardware path twice
	ext4: fix warning in 'ext4_da_release_space'
	KVM: x86: Mask off reserved bits in CPUID.80000008H
	KVM: x86: emulator: em_sysexit should update ctxt->mode
	KVM: x86: emulator: introduce emulator_recalc_and_set_mode
	KVM: x86: emulator: update the emulation mode after CR0 write
	linux/bits.h: make BIT(), GENMASK(), and friends available in assembly
	wifi: brcmfmac: Fix potential buffer overflow in brcmf_fweh_event_worker()
	Linux 4.19.265

Change-Id: Ic909280cdb4170c18dbcd7fcfceaa653d8dc18bd
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 1b654b23 d419ec8e

Documentation/trace/histogram.rst

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ Documentation written by Tom Zanussi 
  will use the event's kernel stacktrace as the key.  The keywords

  'keys' or 'key' can be used to specify keys, and the keywords

  'values', 'vals', or 'val' can be used to specify values.  Compound

  keys consisting of up to two fields can be specified by the 'keys'

  keys consisting of up to three fields can be specified by the 'keys'

  keyword.  Hashing a compound key produces a unique entry in the

  table for each unique combination of component keys, and can be

  useful for providing more fine-grained summaries of event data.

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 264

SUBLEVEL = 265

EXTRAVERSION =

NAME = "People's Front"

arch/parisc/include/asm/hardware.h

+6 −6
Original line number Diff line number Diff line
@@ -10,12 +10,12 @@ 
#define SVERSION_ANY_ID		PA_SVERSION_ANY_ID



struct hp_hardware {

	unsigned short	hw_type:5;	/* HPHW_xxx */

	unsigned short	hversion;

	unsigned long	sversion:28;

	unsigned short	opt;

	const char	name[80];	/* The hardware description */

};

	unsigned int	hw_type:8;	/* HPHW_xxx */

	unsigned int	hversion:12;

	unsigned int	sversion:12;

	unsigned char	opt;

	unsigned char	name[59];	/* The hardware description */

} __packed;



struct parisc_device;

arch/parisc/kernel/drivers.c

+6 −8
Original line number Diff line number Diff line
@@ -861,15 +861,13 @@ void __init walk_central_bus(void) 
			&root);

}



static void print_parisc_device(struct parisc_device *dev)

static __init void print_parisc_device(struct parisc_device *dev)

{

	char hw_path[64];

	static int count;

	static int count __initdata;



	print_pa_hwpath(dev, hw_path);

	pr_info("%d. %s at %pap [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",

		++count, dev->name, &(dev->hpa.start), hw_path, dev->id.hw_type,

		dev->id.hversion_rev, dev->id.hversion, dev->id.sversion);

	pr_info("%d. %s at %pap { type:%d, hv:%#x, sv:%#x, rev:%#x }",

		++count, dev->name, &(dev->hpa.start), dev->id.hw_type,

		dev->id.hversion, dev->id.sversion, dev->id.hversion_rev);



	if (dev->num_addrs) {

		int k;
@@ -1058,7 +1056,7 @@ static __init int qemu_print_iodc_data(struct device *lin_dev, void *data) 






static int print_one_device(struct device * dev, void * data)

static __init int print_one_device(struct device * dev, void * data)

{

	struct parisc_device * pdev = to_parisc_device(dev);

arch/x86/kvm/cpuid.c

+1 −0
Original line number Diff line number Diff line
@@ -680,6 +680,7 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, 
			g_phys_as = phys_as;



		entry->eax = g_phys_as | (virt_as << 8);

		entry->ecx &= ~(GENMASK(31, 16) | GENMASK(11, 8));

		entry->edx = 0;

		/*

		 * IBRS, IBPB and VIRT_SSBD aren't necessarily present in