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

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

Merge 5.4.142 into android11-5.4-lts 



Changes in 5.4.142
	iio: adc: ti-ads7950: Ensure CS is deasserted after reading channels
	iio: humidity: hdc100x: Add margin to the conversion time
	iio: adc: Fix incorrect exit of for-loop
	ASoC: xilinx: Fix reference to PCM buffer address
	ASoC: intel: atom: Fix reference to PCM buffer address
	i2c: dev: zero out array used for i2c reads from userspace
	ceph: reduce contention in ceph_check_delayed_caps()
	ACPI: NFIT: Fix support for virtual SPA ranges
	libnvdimm/region: Fix label activation vs errors
	ieee802154: hwsim: fix GPF in hwsim_set_edge_lqi
	ieee802154: hwsim: fix GPF in hwsim_new_edge_nl
	ASoC: cs42l42: Correct definition of ADC Volume control
	ASoC: cs42l42: Don't allow SND_SOC_DAIFMT_LEFT_J
	ASoC: cs42l42: Fix inversion of ADC Notch Switch control
	ASoC: cs42l42: Remove duplicate control for WNF filter frequency
	netfilter: nf_conntrack_bridge: Fix memory leak when error
	ASoC: cs42l42: Fix LRCLK frame start edge
	net: dsa: mt7530: add the missing RxUnicast MIB counter
	platform/x86: pcengines-apuv2: revert wiring up simswitch GPIO as LED
	platform/x86: pcengines-apuv2: Add missing terminating entries to gpio-lookup tables
	net: phy: micrel: Fix link detection on ksz87xx switch"
	ppp: Fix generating ifname when empty IFLA_IFNAME is specified
	net: sched: act_mirred: Reset ct info when mirror/redirect skb
	iavf: Set RSS LUT and key in reset handle path
	psample: Add a fwd declaration for skbuff
	net/mlx5: Fix return value from tracer initialization
	drm/meson: fix colour distortion from HDR set during vendor u-boot
	net: dsa: microchip: Fix ksz_read64()
	net: Fix memory leak in ieee802154_raw_deliver
	net: igmp: fix data-race in igmp_ifc_timer_expire()
	net: dsa: lan9303: fix broken backpressure in .port_fdb_dump
	net: dsa: lantiq: fix broken backpressure in .port_fdb_dump
	net: dsa: sja1105: fix broken backpressure in .port_fdb_dump
	net: bridge: fix memleak in br_add_if()
	net: linkwatch: fix failure to restore device state across suspend/resume
	tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets
	net: igmp: increase size of mr_ifc_count
	xen/events: Fix race in set_evtchn_to_irq
	vsock/virtio: avoid potential deadlock when vsock device remove
	nbd: Aovid double completion of a request
	powerpc/kprobes: Fix kprobe Oops happens in booke
	x86/tools: Fix objdump version check again
	genirq: Provide IRQCHIP_AFFINITY_PRE_STARTUP
	x86/msi: Force affinity setup before startup
	x86/ioapic: Force affinity setup before startup
	x86/resctrl: Fix default monitoring groups reporting
	genirq/msi: Ensure deactivation on teardown
	genirq/timings: Prevent potential array overflow in __irq_timings_store()
	PCI/MSI: Enable and mask MSI-X early
	PCI/MSI: Mask all unused MSI-X entries
	PCI/MSI: Enforce that MSI-X table entry is masked for update
	PCI/MSI: Enforce MSI[X] entry updates to be visible
	PCI/MSI: Do not set invalid bits in MSI mask
	PCI/MSI: Correct misleading comments
	PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown()
	PCI/MSI: Protect msi_desc::masked for multi-MSI
	KVM: VMX: Use current VMCS to query WAITPKG support for MSR emulation
	ceph: add some lockdep assertions around snaprealm handling
	ceph: clean up locking annotation for ceph_get_snap_realm and __lookup_snap_realm
	ceph: take snap_empty_lock atomically with snaprealm refcount change
	vmlinux.lds.h: Handle clang's module.{c,d}tor sections
	iommu/vt-d: Fix agaw for a supported 48 bit guest address width
	KVM: nSVM: avoid picking up unsupported bits from L2 in int_ctl (CVE-2021-3653)
	KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656)
	Linux 5.4.142

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I7df2f917694a7f6d1eefb220b57271612b026443
parents 48266f7c c15b830f

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 141

SUBLEVEL = 142

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/powerpc/kernel/kprobes.c

+2 −1
Original line number Diff line number Diff line
@@ -264,7 +264,8 @@ int kprobe_handler(struct pt_regs *regs) 
	if (user_mode(regs))

		return 0;



	if (!(regs->msr & MSR_IR) || !(regs->msr & MSR_DR))

	if (!IS_ENABLED(CONFIG_BOOKE) &&

	    (!(regs->msr & MSR_IR) || !(regs->msr & MSR_DR)))

		return 0;



	/*

arch/x86/include/asm/svm.h

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ struct __attribute__ ((__packed__)) vmcb_control_area { 
#define V_IGN_TPR_SHIFT 20

#define V_IGN_TPR_MASK (1 << V_IGN_TPR_SHIFT)



#define V_IRQ_INJECTION_BITS_MASK (V_IRQ_MASK | V_INTR_PRIO_MASK | V_IGN_TPR_MASK)



#define V_INTR_MASKING_SHIFT 24

#define V_INTR_MASKING_MASK (1 << V_INTR_MASKING_SHIFT)

arch/x86/kernel/apic/io_apic.c

+4 −2
Original line number Diff line number Diff line
@@ -1961,7 +1961,8 @@ static struct irq_chip ioapic_chip __read_mostly = { 
	.irq_set_affinity	= ioapic_set_affinity,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_get_irqchip_state	= ioapic_irq_get_chip_state,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

	.flags			= IRQCHIP_SKIP_SET_WAKE |

				  IRQCHIP_AFFINITY_PRE_STARTUP,

};



static struct irq_chip ioapic_ir_chip __read_mostly = {
@@ -1974,7 +1975,8 @@ static struct irq_chip ioapic_ir_chip __read_mostly = { 
	.irq_set_affinity	= ioapic_set_affinity,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_get_irqchip_state	= ioapic_irq_get_chip_state,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

	.flags			= IRQCHIP_SKIP_SET_WAKE |

				  IRQCHIP_AFFINITY_PRE_STARTUP,

};



static inline void init_IO_APIC_traps(void)

arch/x86/kernel/apic/msi.c

+9 −4
Original line number Diff line number Diff line
@@ -86,11 +86,13 @@ msi_set_affinity(struct irq_data *irqd, const struct cpumask *mask, bool force) 
	 *   The quirk bit is not set in this case.

	 * - The new vector is the same as the old vector

	 * - The old vector is MANAGED_IRQ_SHUTDOWN_VECTOR (interrupt starts up)

	 * - The interrupt is not yet started up

	 * - The new destination CPU is the same as the old destination CPU

	 */

	if (!irqd_msi_nomask_quirk(irqd) ||

	    cfg->vector == old_cfg.vector ||

	    old_cfg.vector == MANAGED_IRQ_SHUTDOWN_VECTOR ||

	    !irqd_is_started(irqd) ||

	    cfg->dest_apicid == old_cfg.dest_apicid) {

		irq_msi_update_msg(irqd, cfg);

		return ret;
@@ -178,7 +180,8 @@ static struct irq_chip pci_msi_controller = { 
	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_compose_msi_msg	= irq_msi_compose_msg,

	.irq_set_affinity	= msi_set_affinity,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

	.flags			= IRQCHIP_SKIP_SET_WAKE |

				  IRQCHIP_AFFINITY_PRE_STARTUP,

};



int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
@@ -279,7 +282,8 @@ static struct irq_chip pci_msi_ir_controller = { 
	.irq_ack		= irq_chip_ack_parent,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_set_vcpu_affinity	= irq_chip_set_vcpu_affinity_parent,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

	.flags			= IRQCHIP_SKIP_SET_WAKE |

				  IRQCHIP_AFFINITY_PRE_STARTUP,

};



static struct msi_domain_info pci_msi_ir_domain_info = {
@@ -322,7 +326,8 @@ static struct irq_chip dmar_msi_controller = { 
	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_compose_msi_msg	= irq_msi_compose_msg,

	.irq_write_msi_msg	= dmar_msi_write_msg,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

	.flags			= IRQCHIP_SKIP_SET_WAKE |

				  IRQCHIP_AFFINITY_PRE_STARTUP,

};



static irq_hw_number_t dmar_msi_get_hwirq(struct msi_domain_info *info,
@@ -420,7 +425,7 @@ static struct irq_chip hpet_msi_controller __ro_after_init = { 
	.irq_retrigger = irq_chip_retrigger_hierarchy,

	.irq_compose_msi_msg = irq_msi_compose_msg,

	.irq_write_msi_msg = hpet_msi_write_msg,

	.flags = IRQCHIP_SKIP_SET_WAKE,

	.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_AFFINITY_PRE_STARTUP,

};



static irq_hw_number_t hpet_msi_get_hwirq(struct msi_domain_info *info,