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

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

Merge 4.19.144 into android-4.19-stable 



Changes in 4.19.144
	HID: core: Correctly handle ReportSize being zero
	HID: core: Sanitize event code and type when mapping input
	perf record/stat: Explicitly call out event modifiers in the documentation
	scsi: target: tcmu: Fix size in calls to tcmu_flush_dcache_range
	scsi: target: tcmu: Optimize use of flush_dcache_page
	tty: serial: qcom_geni_serial: Drop __init from qcom_geni_console_setup
	drm/msm: add shutdown support for display platform_driver
	hwmon: (applesmc) check status earlier.
	nvmet: Disable keep-alive timer when kato is cleared to 0h
	drm/msm/a6xx: fix gmu start on newer firmware
	ceph: don't allow setlease on cephfs
	cpuidle: Fixup IRQ state
	s390: don't trace preemption in percpu macros
	xen/xenbus: Fix granting of vmalloc'd memory
	dmaengine: of-dma: Fix of_dma_router_xlate's of_dma_xlate handling
	batman-adv: Avoid uninitialized chaddr when handling DHCP
	batman-adv: Fix own OGM check in aggregated OGMs
	batman-adv: bla: use netif_rx_ni when not in interrupt context
	dmaengine: at_hdmac: check return value of of_find_device_by_node() in at_dma_xlate()
	MIPS: mm: BMIPS5000 has inclusive physical caches
	MIPS: BMIPS: Also call bmips_cpu_setup() for secondary cores
	netfilter: nf_tables: add NFTA_SET_USERDATA if not null
	netfilter: nf_tables: incorrect enum nft_list_attributes definition
	netfilter: nf_tables: fix destination register zeroing
	net: hns: Fix memleak in hns_nic_dev_probe
	net: systemport: Fix memleak in bcm_sysport_probe
	ravb: Fixed to be able to unload modules
	net: arc_emac: Fix memleak in arc_mdio_probe
	dmaengine: pl330: Fix burst length if burst size is smaller than bus width
	gtp: add GTPA_LINK info to msg sent to userspace
	bnxt_en: Don't query FW when netif_running() is false.
	bnxt_en: Check for zero dir entries in NVRAM.
	bnxt_en: Fix PCI AER error recovery flow
	bnxt_en: fix HWRM error when querying VF temperature
	xfs: fix boundary test in xfs_attr_shortform_verify
	bnxt: don't enable NAPI until rings are ready
	selftests/bpf: Fix massive output from test_maps
	netfilter: nfnetlink: nfnetlink_unicast() reports EAGAIN instead of ENOBUFS
	nvmet-fc: Fix a missed _irqsave version of spin_lock in 'nvmet_fc_fod_op_done()'
	perf tools: Correct SNOOPX field offset
	net: ethernet: mlx4: Fix memory allocation in mlx4_buddy_init()
	fix regression in "epoll: Keep a reference on files added to the check list"
	net: gemini: Fix another missing clk_disable_unprepare() in probe
	xfs: fix xfs_bmap_validate_extent_raw when checking attr fork of rt files
	perf jevents: Fix suspicious code in fixregex()
	tg3: Fix soft lockup when tg3_reset_task() fails.
	x86, fakenuma: Fix invalid starting node ID
	iommu/vt-d: Serialize IOMMU GCMD register modifications
	thermal: ti-soc-thermal: Fix bogus thermal shutdowns for omap4430
	include/linux/log2.h: add missing () around n in roundup_pow_of_two()
	ext2: don't update mtime on COW faults
	xfs: don't update mtime on COW faults
	btrfs: drop path before adding new uuid tree entry
	vfio/type1: Support faulting PFNMAP vmas
	vfio-pci: Fault mmaps to enable vma tracking
	vfio-pci: Invalidate mmaps and block MMIO access on disabled memory
	btrfs: Remove redundant extent_buffer_get in get_old_root
	btrfs: Remove extraneous extent_buffer_get from tree_mod_log_rewind
	btrfs: set the lockdep class for log tree extent buffers
	uaccess: Add non-pagefault user-space read functions
	uaccess: Add non-pagefault user-space write function
	btrfs: fix potential deadlock in the search ioctl
	net: usb: qmi_wwan: add Telit 0x1050 composition
	usb: qmi_wwan: add D-Link DWM-222 A2 device ID
	ALSA: ca0106: fix error code handling
	ALSA: pcm: oss: Remove superfluous WARN_ON() for mulaw sanity check
	ALSA: hda/hdmi: always check pin power status in i915 pin fixup
	ALSA: firewire-digi00x: exclude Avid Adrenaline from detection
	ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO
	media: rc: do not access device via sysfs after rc_unregister_device()
	media: rc: uevent sysfs file races with rc_unregister_device()
	affs: fix basic permission bits to actually work
	block: allow for_each_bvec to support zero len bvec
	libata: implement ATA_HORKAGE_MAX_TRIM_128M and apply to Sandisks
	dm writecache: handle DAX to partitions on persistent memory correctly
	dm cache metadata: Avoid returning cmd->bm wild pointer on error
	dm thin metadata: Avoid returning cmd->bm wild pointer on error
	mm: slub: fix conversion of freelist_corrupted()
	KVM: arm64: Add kvm_extable for vaxorcism code
	KVM: arm64: Defer guest entry when an asynchronous exception is pending
	KVM: arm64: Survive synchronous exceptions caused by AT instructions
	KVM: arm64: Set HCR_EL2.PTW to prevent AT taking synchronous exception
	vfio/pci: Fix SR-IOV VF handling with MMIO blocking
	checkpatch: fix the usage of capture group ( ... )
	mm/hugetlb: fix a race between hugetlb sysctl handlers
	cfg80211: regulatory: reject invalid hints
	net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()
	Linux 4.19.144

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I81d6b3f044fe0dd919d1ece16d131c2185c00bb3
parents a13ec5ea 67957f12

Documentation/filesystems/affs.txt

+10 −6
Original line number Diff line number Diff line
@@ -93,13 +93,15 @@ The Amiga protection flags RWEDRWEDHSPARWED are handled as follows: 


  - R maps to r for user, group and others. On directories, R implies x.



  - If both W and D are allowed, w will be set.

  - W maps to w.



  - E maps to x.



  - H and P are always retained and ignored under Linux.

  - D is ignored.



  - A is always reset when a file is written to.

  - H, S and P are always retained and ignored under Linux.



  - A is cleared when a file is written to.



User id and group id will be used unless set[gu]id are given as mount

options. Since most of the Amiga file systems are single user systems
@@ -111,11 +113,13 @@ Linux -> Amiga: 


The Linux rwxrwxrwx file mode is handled as follows:



  - r permission will set R for user, group and others.

  - r permission will allow R for user, group and others.



  - w permission will allow W for user, group and others.



  - w permission will set W and D for user, group and others.

  - x permission of the user will allow E for plain files.



  - x permission of the user will set E for plain files.

  - D will be allowed for user, group and others.



  - All other flags (suid, sgid, ...) are ignored and will

    not be retained.

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 143

SUBLEVEL = 144

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/include/asm/kvm_arm.h

+2 −1
Original line number Diff line number Diff line
@@ -83,11 +83,12 @@ 
 * IMO:		Override CPSR.I and enable signaling with VI

 * FMO:		Override CPSR.F and enable signaling with VF

 * SWIO:	Turn set/way invalidates into set/way clean+invalidate

 * PTW:		Take a stage2 fault if a stage1 walk steps in device memory

 */

#define HCR_GUEST_FLAGS (HCR_TSC | HCR_TSW | HCR_TWE | HCR_TWI | HCR_VM | \

			 HCR_TVM | HCR_BSU_IS | HCR_FB | HCR_TAC | \

			 HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW | HCR_TLOR | \

			 HCR_FMO | HCR_IMO)

			 HCR_FMO | HCR_IMO | HCR_PTW )

#define HCR_VIRT_EXCP_MASK (HCR_VSE | HCR_VI | HCR_VF)

#define HCR_HOST_NVHE_FLAGS (HCR_RW | HCR_API | HCR_APK)

#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H)

arch/arm64/include/asm/kvm_asm.h

+43 −0
Original line number Diff line number Diff line
@@ -87,6 +87,34 @@ extern u32 __init_stage2_translation(void); 
		*__hyp_this_cpu_ptr(sym);				\

	 })



#define __KVM_EXTABLE(from, to)						\

	"	.pushsection	__kvm_ex_table, \"a\"\n"		\

	"	.align		3\n"					\

	"	.long		(" #from " - .), (" #to " - .)\n"	\

	"	.popsection\n"





#define __kvm_at(at_op, addr)						\

( { 									\

	int __kvm_at_err = 0;						\

	u64 spsr, elr;							\

	asm volatile(							\

	"	mrs	%1, spsr_el2\n"					\

	"	mrs	%2, elr_el2\n"					\

	"1:	at	"at_op", %3\n"					\

	"	isb\n"							\

	"	b	9f\n"						\

	"2:	msr	spsr_el2, %1\n"					\

	"	msr	elr_el2, %2\n"					\

	"	mov	%w0, %4\n"					\

	"9:\n"								\

	__KVM_EXTABLE(1b, 2b)						\

	: "+r" (__kvm_at_err), "=&r" (spsr), "=&r" (elr)		\

	: "r" (addr), "i" (-EFAULT));					\

	__kvm_at_err;							\

} )





#else /* __ASSEMBLY__ */



.macro hyp_adr_this_cpu reg, sym, tmp
@@ -111,6 +139,21 @@ extern u32 __init_stage2_translation(void); 
	kern_hyp_va	\vcpu

.endm



/*

 * KVM extable for unexpected exceptions.

 * In the same format _asm_extable, but output to a different section so that

 * it can be mapped to EL2. The KVM version is not sorted. The caller must

 * ensure:

 * x18 has the hypervisor value to allow any Shadow-Call-Stack instrumented

 * code to write to it, and that SPSR_EL2 and ELR_EL2 are restored by the fixup.

 */

.macro	_kvm_extable, from, to

	.pushsection	__kvm_ex_table, "a"

	.align		3

	.long		(\from - .), (\to - .)

	.popsection

.endm



#endif



#endif /* __ARM_KVM_ASM_H__ */

arch/arm64/kernel/vmlinux.lds.S

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,13 @@ ENTRY(_text) 


jiffies = jiffies_64;





#define HYPERVISOR_EXTABLE					\

	. = ALIGN(SZ_8);					\

	__start___kvm_ex_table = .;				\

	*(__kvm_ex_table)					\

	__stop___kvm_ex_table = .;



#define HYPERVISOR_TEXT					\

	/*						\

	 * Align to 4 KB so that			\
@@ -39,6 +46,7 @@ jiffies = jiffies_64; 
	__hyp_idmap_text_end = .;			\

	__hyp_text_start = .;				\

	*(.hyp.text)					\

	HYPERVISOR_EXTABLE				\

	__hyp_text_end = .;



#define IDMAP_TEXT					\