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

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

Merge 4.19.161 into android-4.19-stable 



Changes in 4.19.161
	perf event: Check ref_reloc_sym before using it
	netfilter: clear skb->next in NF_HOOK_LIST()
	btrfs: don't access possibly stale fs_info data for printing duplicate device
	btrfs: fix lockdep splat when reading qgroup config on mount
	wireless: Use linux/stddef.h instead of stddef.h
	KVM: arm64: vgic-v3: Drop the reporting of GICR_TYPER.Last for userspace
	KVM: x86: handle !lapic_in_kernel case in kvm_cpu_*_extint
	KVM: x86: Fix split-irqchip vs interrupt injection window request
	arm64: pgtable: Fix pte_accessible()
	arm64: pgtable: Ensure dirty bit is preserved across pte_wrprotect()
	drm/atomic_helper: Stop modesets on unregistered connectors harder
	ALSA: hda/hdmi: fix incorrect locking in hdmi_pcm_close
	HID: cypress: Support Varmilo Keyboards' media hotkeys
	HID: add support for Sega Saturn
	Input: i8042 - allow insmod to succeed on devices without an i8042 controller
	HID: hid-sensor-hub: Fix issue with devices with no report ID
	HID: add HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE for Gamevice devices
	dmaengine: xilinx_dma: use readl_poll_timeout_atomic variant
	x86/xen: don't unbind uninitialized lock_kicker_irq
	HID: Add Logitech Dinovo Edge battery quirk
	proc: don't allow async path resolution of /proc/self components
	nvme: free sq/cq dbbuf pointers when dbbuf set fails
	dmaengine: pl330: _prep_dma_memcpy: Fix wrong burst size
	scsi: libiscsi: Fix NOP race condition
	scsi: target: iscsi: Fix cmd abort fabric stop race
	perf/x86: fix sysfs type mismatches
	xtensa: uaccess: Add missing __user to strncpy_from_user() prototype
	phy: tegra: xusb: Fix dangling pointer on probe failure
	batman-adv: set .owner to THIS_MODULE
	ARM: dts: dra76x: m_can: fix order of clocks
	scsi: ufs: Fix race between shutdown and runtime resume flow
	bnxt_en: fix error return code in bnxt_init_one()
	bnxt_en: fix error return code in bnxt_init_board()
	video: hyperv_fb: Fix the cache type when mapping the VRAM
	bnxt_en: Release PCI regions when DMA mask setup fails during probe.
	cxgb4: fix the panic caused by non smac rewrite
	s390/qeth: fix tear down of async TX buffers
	IB/mthca: fix return value of error branch in mthca_init_cq()
	nfc: s3fwrn5: use signed integer for parsing GPIO numbers
	net: ena: set initial DMA width to avoid intel iommu issue
	ibmvnic: fix NULL pointer dereference in reset_sub_crq_queues
	ibmvnic: fix NULL pointer dereference in ibmvic_reset_crq
	optee: add writeback to valid memory type
	efivarfs: revert "fix memory leak in efivarfs_create()"
	can: gs_usb: fix endianess problem with candleLight firmware
	platform/x86: thinkpad_acpi: Send tablet mode switch at wakeup time
	platform/x86: toshiba_acpi: Fix the wrong variable assignment
	can: m_can: fix nominal bitiming tseg2 min for version >= 3.1
	perf probe: Fix to die_entrypc() returns error correctly
	USB: core: Change %pK for __user pointers to %px
	usb: gadget: f_midi: Fix memleak in f_midi_alloc
	USB: quirks: Add USB_QUIRK_DISCONNECT_SUSPEND quirk for Lenovo A630Z TIO built-in usb-audio card
	usb: gadget: Fix memleak in gadgetfs_fill_super
	x86/speculation: Fix prctl() when spectre_v2_user={seccomp,prctl},ibpb
	x86/resctrl: Remove superfluous kernfs_get() calls to prevent refcount leak
	x86/resctrl: Add necessary kernfs_put() calls to prevent refcount leak
	USB: core: Fix regression in Hercules audio card
	Linux 4.19.161

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib704b9ff60755978b272aa358d25ddb217cc37bc
parents 442c302e daefdc9e

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 160

SUBLEVEL = 161

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/dra76x.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 
				interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-names = "int0", "int1";

				clocks = <&mcan_clk>, <&l3_iclk_div>;

				clock-names = "cclk", "hclk";

				clocks = <&l3_iclk_div>, <&mcan_clk>;

				clock-names = "hclk", "cclk";

				bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;

			};

		};

arch/arm64/include/asm/pgtable.h

+18 −16
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; 
#define pte_valid(pte)		(!!(pte_val(pte) & PTE_VALID))

#define pte_valid_not_user(pte) \

	((pte_val(pte) & (PTE_VALID | PTE_USER)) == PTE_VALID)

#define pte_valid_young(pte) \

	((pte_val(pte) & (PTE_VALID | PTE_AF)) == (PTE_VALID | PTE_AF))

#define pte_valid_user(pte) \

	((pte_val(pte) & (PTE_VALID | PTE_USER)) == (PTE_VALID | PTE_USER))
@@ -116,9 +114,12 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; 
 * Could the pte be present in the TLB? We must check mm_tlb_flush_pending

 * so that we don't erroneously return false for pages that have been

 * remapped as PROT_NONE but are yet to be flushed from the TLB.

 * Note that we can't make any assumptions based on the state of the access

 * flag, since ptep_clear_flush_young() elides a DSB when invalidating the

 * TLB.

 */

#define pte_accessible(mm, pte)	\

	(mm_tlb_flush_pending(mm) ? pte_present(pte) : pte_valid_young(pte))

	(mm_tlb_flush_pending(mm) ? pte_present(pte) : pte_valid(pte))



/*

 * p??_access_permitted() is true for valid user mappings (subject to the
@@ -144,13 +145,6 @@ static inline pte_t set_pte_bit(pte_t pte, pgprot_t prot) 
	return pte;

}



static inline pte_t pte_wrprotect(pte_t pte)

{

	pte = clear_pte_bit(pte, __pgprot(PTE_WRITE));

	pte = set_pte_bit(pte, __pgprot(PTE_RDONLY));

	return pte;

}



static inline pte_t pte_mkwrite(pte_t pte)

{

	pte = set_pte_bit(pte, __pgprot(PTE_WRITE));
@@ -176,6 +170,20 @@ static inline pte_t pte_mkdirty(pte_t pte) 
	return pte;

}



static inline pte_t pte_wrprotect(pte_t pte)

{

	/*

	 * If hardware-dirty (PTE_WRITE/DBM bit set and PTE_RDONLY

	 * clear), set the PTE_DIRTY bit.

	 */

	if (pte_hw_dirty(pte))

		pte = pte_mkdirty(pte);



	pte = clear_pte_bit(pte, __pgprot(PTE_WRITE));

	pte = set_pte_bit(pte, __pgprot(PTE_RDONLY));

	return pte;

}



static inline pte_t pte_mkold(pte_t pte)

{

	return clear_pte_bit(pte, __pgprot(PTE_AF));
@@ -668,12 +676,6 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres 
	pte = READ_ONCE(*ptep);

	do {

		old_pte = pte;

		/*

		 * If hardware-dirty (PTE_WRITE/DBM bit set and PTE_RDONLY

		 * clear), set the PTE_DIRTY bit.

		 */

		if (pte_hw_dirty(pte))

			pte = pte_mkdirty(pte);

		pte = pte_wrprotect(pte);

		pte_val(pte) = cmpxchg_relaxed(&pte_val(*ptep),

					       pte_val(old_pte), pte_val(pte));

arch/x86/events/intel/cstate.c

+3 −3
Original line number Diff line number Diff line
@@ -100,14 +100,14 @@ 
MODULE_LICENSE("GPL");



#define DEFINE_CSTATE_FORMAT_ATTR(_var, _name, _format)		\

static ssize_t __cstate_##_var##_show(struct kobject *kobj,	\

				struct kobj_attribute *attr,	\

static ssize_t __cstate_##_var##_show(struct device *dev,	\

				struct device_attribute *attr,	\

				char *page)			\

{								\

	BUILD_BUG_ON(sizeof(_format) >= PAGE_SIZE);		\

	return sprintf(page, _format "\n");			\

}								\

static struct kobj_attribute format_attr_##_var =		\

static struct device_attribute format_attr_##_var =		\

	__ATTR(_name, 0444, __cstate_##_var##_show, NULL)



static ssize_t cstate_get_attr_cpumask(struct device *dev,

arch/x86/events/intel/rapl.c

+1 −13
Original line number Diff line number Diff line
@@ -115,18 +115,6 @@ static const char *const rapl_domain_names[NR_RAPL_DOMAINS] __initconst = { 
 * any other bit is reserved

 */

#define RAPL_EVENT_MASK	0xFFULL



#define DEFINE_RAPL_FORMAT_ATTR(_var, _name, _format)		\

static ssize_t __rapl_##_var##_show(struct kobject *kobj,	\

				struct kobj_attribute *attr,	\

				char *page)			\

{								\

	BUILD_BUG_ON(sizeof(_format) >= PAGE_SIZE);		\

	return sprintf(page, _format "\n");			\

}								\

static struct kobj_attribute format_attr_##_var =		\

	__ATTR(_name, 0444, __rapl_##_var##_show, NULL)



#define RAPL_CNTR_WIDTH 32



#define RAPL_EVENT_ATTR_STR(_name, v, str)					\
@@ -548,7 +536,7 @@ static struct attribute_group rapl_pmu_events_group = { 
	.attrs = NULL, /* patched at runtime */

};



DEFINE_RAPL_FORMAT_ATTR(event, event, "config:0-7");

PMU_FORMAT_ATTR(event, "config:0-7");

static struct attribute *rapl_formats_attr[] = {

	&format_attr_event.attr,

	NULL,