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

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

Merge 5.4.151 into android11-5.4-lts 



Changes in 5.4.151
	tty: Fix out-of-bound vmalloc access in imageblit
	cpufreq: schedutil: Use kobject release() method to free sugov_tunables
	cpufreq: schedutil: Destroy mutex before kobject_put() frees the memory
	usb: cdns3: fix race condition before setting doorbell
	fs-verity: fix signed integer overflow with i_size near S64_MAX
	hwmon: (w83793) Fix NULL pointer dereference by removing unnecessary structure field
	hwmon: (w83792d) Fix NULL pointer dereference by removing unnecessary structure field
	hwmon: (w83791d) Fix NULL pointer dereference by removing unnecessary structure field
	scsi: ufs: Fix illegal offset in UPIU event trace
	mac80211: fix use-after-free in CCMP/GCMP RX
	x86/kvmclock: Move this_cpu_pvti into kvmclock.h
	drm/amd/display: Pass PCI deviceid into DC
	ipvs: check that ip_vs_conn_tab_bits is between 8 and 20
	hwmon: (mlxreg-fan) Return non-zero value when fan current state is enforced from sysfs
	mac80211: Fix ieee80211_amsdu_aggregate frag_tail bug
	mac80211: limit injected vht mcs/nss in ieee80211_parse_tx_radiotap
	mac80211: mesh: fix potentially unaligned access
	mac80211-hwsim: fix late beacon hrtimer handling
	sctp: break out if skb_header_pointer returns NULL in sctp_rcv_ootb
	hwmon: (tmp421) report /PVLD condition as fault
	hwmon: (tmp421) fix rounding for negative values
	net: ipv4: Fix rtnexthop len when RTA_FLOW is present
	e100: fix length calculation in e100_get_regs_len
	e100: fix buffer overrun in e100_get_regs
	selftests, bpf: test_lwt_ip_encap: Really disable rp_filter
	Revert "block, bfq: honor already-setup queue merges"
	scsi: csiostor: Add module softdep on cxgb4
	net: hns3: do not allow call hns3_nic_net_open repeatedly
	net: sched: flower: protect fl_walk() with rcu
	af_unix: fix races in sk_peer_pid and sk_peer_cred accesses
	perf/x86/intel: Update event constraints for ICX
	elf: don't use MAP_FIXED_NOREPLACE for elf interpreter mappings
	debugfs: debugfs_create_file_size(): use IS_ERR to check for error
	ipack: ipoctal: fix stack information leak
	ipack: ipoctal: fix tty registration race
	ipack: ipoctal: fix tty-registration error handling
	ipack: ipoctal: fix missing allocation-failure check
	ipack: ipoctal: fix module reference leak
	ext4: fix loff_t overflow in ext4_max_bitmap_size()
	ext4: fix reserved space counter leakage
	ext4: fix potential infinite loop in ext4_dx_readdir()
	HID: u2fzero: ignore incomplete packets without data
	net: udp: annotate data race around udp_sk(sk)->corkflag
	net: stmmac: don't attach interface until resume finishes
	PCI: Fix pci_host_bridge struct device release/free handling
	libnvdimm/pmem: Fix crash triggered when I/O in-flight during unbind
	hso: fix bailout in error case of probe
	usb: hso: fix error handling code of hso_create_net_device
	usb: hso: remove the bailout parameter
	crypto: ccp - fix resource leaks in ccp_run_aes_gcm_cmd()
	HID: betop: fix slab-out-of-bounds Write in betop_probe
	netfilter: ipset: Fix oversized kvmalloc() calls
	HID: usbhid: free raw_report buffers in usbhid_stop
	Linux 5.4.151

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia17e8c3652557ea19539a107c146bf74f17902b9
parents ec298edf 31cdcb6d

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 150

SUBLEVEL = 151

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/x86/events/intel/core.c

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ static struct event_constraint intel_icl_event_constraints[] = { 
	INTEL_EVENT_CONSTRAINT_RANGE(0xa8, 0xb0, 0xf),

	INTEL_EVENT_CONSTRAINT_RANGE(0xb7, 0xbd, 0xf),

	INTEL_EVENT_CONSTRAINT_RANGE(0xd0, 0xe6, 0xf),

	INTEL_EVENT_CONSTRAINT(0xef, 0xf),

	INTEL_EVENT_CONSTRAINT_RANGE(0xf0, 0xf4, 0xf),

	EVENT_CONSTRAINT_END

};

arch/x86/include/asm/kvmclock.h

+14 −0
Original line number Diff line number Diff line
@@ -2,6 +2,20 @@ 
#ifndef _ASM_X86_KVM_CLOCK_H

#define _ASM_X86_KVM_CLOCK_H



#include <linux/percpu.h>



extern struct clocksource kvm_clock;



DECLARE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu);



static inline struct pvclock_vcpu_time_info *this_cpu_pvti(void)

{

	return &this_cpu_read(hv_clock_per_cpu)->pvti;

}



static inline struct pvclock_vsyscall_time_info *this_cpu_hvclock(void)

{

	return this_cpu_read(hv_clock_per_cpu);

}



#endif /* _ASM_X86_KVM_CLOCK_H */

arch/x86/kernel/kvmclock.c

+2 −11
Original line number Diff line number Diff line
@@ -50,18 +50,9 @@ early_param("no-kvmclock-vsyscall", parse_no_kvmclock_vsyscall); 
static struct pvclock_vsyscall_time_info

			hv_clock_boot[HVC_BOOT_ARRAY_SIZE] __bss_decrypted __aligned(PAGE_SIZE);

static struct pvclock_wall_clock wall_clock __bss_decrypted;

static DEFINE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu);

static struct pvclock_vsyscall_time_info *hvclock_mem;



static inline struct pvclock_vcpu_time_info *this_cpu_pvti(void)

{

	return &this_cpu_read(hv_clock_per_cpu)->pvti;

}



static inline struct pvclock_vsyscall_time_info *this_cpu_hvclock(void)

{

	return this_cpu_read(hv_clock_per_cpu);

}

DEFINE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu);

EXPORT_PER_CPU_SYMBOL_GPL(hv_clock_per_cpu);



/*

 * The wallclock is the time of day when we booted. Since then, some time may

block/bfq-iosched.c

+3 −13
Original line number Diff line number Diff line
@@ -2523,15 +2523,6 @@ bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) 
	 * are likely to increase the throughput.

	 */

	bfqq->new_bfqq = new_bfqq;

	/*

	 * The above assignment schedules the following redirections:

	 * each time some I/O for bfqq arrives, the process that

	 * generated that I/O is disassociated from bfqq and

	 * associated with new_bfqq. Here we increases new_bfqq->ref

	 * in advance, adding the number of processes that are

	 * expected to be associated with new_bfqq as they happen to

	 * issue I/O.

	 */

	new_bfqq->ref += process_refs;

	return new_bfqq;

}
@@ -2591,10 +2582,6 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, 
{

	struct bfq_queue *in_service_bfqq, *new_bfqq;



	/* if a merge has already been setup, then proceed with that first */

	if (bfqq->new_bfqq)

		return bfqq->new_bfqq;



	/*

	 * Do not perform queue merging if the device is non

	 * rotational and performs internal queueing. In fact, such a
@@ -2649,6 +2636,9 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, 
	if (bfq_too_late_for_merging(bfqq))

		return NULL;



	if (bfqq->new_bfqq)

		return bfqq->new_bfqq;



	if (!io_struct || unlikely(bfqq == &bfqd->oom_bfqq))

		return NULL;