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

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

Merge 4.9.247 into android-4.9-q 



Changes in 4.9.247
	perf event: Check ref_reloc_sym before using it
	mm/userfaultfd: do not access vma->vm_mm after calling handle_userfault()
	btrfs: fix lockdep splat when reading qgroup config on mount
	PCI: Add device even if driver attach failed
	btrfs: tree-checker: Enhance chunk checker to validate chunk profile
	btrfs: inode: Verify inode mode to avoid NULL pointer dereference
	arm64: pgtable: Fix pte_accessible()
	ALSA: hda/hdmi: Use single mutex unlock in error paths
	ALSA: hda/hdmi: fix incorrect locking in hdmi_pcm_close
	HID: cypress: Support Varmilo Keyboards' media hotkeys
	Input: i8042 - allow insmod to succeed on devices without an i8042 controller
	HID: hid-sensor-hub: Fix issue with devices with no report ID
	dmaengine: xilinx_dma: use readl_poll_timeout_atomic variant
	x86/xen: don't unbind uninitialized lock_kicker_irq
	proc: don't allow async path resolution of /proc/self components
	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
	phy: tegra: xusb: Fix dangling pointer on probe failure
	batman-adv: set .owner to THIS_MODULE
	scsi: ufs: Fix race between shutdown and runtime resume flow
	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.
	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 ibmvic_reset_crq
	efivarfs: revert "fix memory leak in efivarfs_create()"
	can: gs_usb: fix endianess problem with candleLight firmware
	platform/x86: toshiba_acpi: Fix the wrong variable assignment
	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: gadget: Fix memleak in gadgetfs_fill_super
	x86/speculation: Fix prctl() when spectre_v2_user={seccomp,prctl},ibpb
	regulator: avoid resolve_supply() infinite recursion
	regulator: workaround self-referent regulators
	USB: core: add endpoint-blacklist quirk
	USB: core: Fix regression in Hercules audio card
	Linux 4.9.247

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I077a342073700f16f0d902b10597b7a3ded56914
parents e415ad9a 5d55c2ad

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 246

SUBLEVEL = 247

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm64/include/asm/pgtable.h

+4 −3
Original line number Diff line number Diff line
@@ -85,8 +85,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))
@@ -94,9 +92,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

arch/x86/events/intel/cstate.c

+3 −3
Original line number Diff line number Diff line
@@ -98,14 +98,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,

arch/x86/events/intel/uncore.c

+2 −2
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ struct pci2phy_map *__find_pci2phy_map(int segment) 
	return map;

}



ssize_t uncore_event_show(struct kobject *kobj,

			  struct kobj_attribute *attr, char *buf)

ssize_t uncore_event_show(struct device *dev,

			  struct device_attribute *attr, char *buf)

{

	struct uncore_event_desc *event =

		container_of(attr, struct uncore_event_desc, attr);