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

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

Merge 4.19.107 into android-4.19 



Changes in 4.19.107
	iommu/qcom: Fix bogus detach logic
	ALSA: hda: Use scnprintf() for printing texts for sysfs/procfs
	ALSA: hda/realtek - Apply quirk for MSI GP63, too
	ALSA: hda/realtek - Apply quirk for yet another MSI laptop
	ASoC: sun8i-codec: Fix setting DAI data format
	ecryptfs: fix a memory leak bug in parse_tag_1_packet()
	ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()
	thunderbolt: Prevent crash if non-active NVMem file is read
	USB: misc: iowarrior: add support for 2 OEMed devices
	USB: misc: iowarrior: add support for the 28 and 28L devices
	USB: misc: iowarrior: add support for the 100 device
	floppy: check FDC index for errors before assigning it
	vt: fix scrollback flushing on background consoles
	vt: selection, handle pending signals in paste_selection
	vt: vt_ioctl: fix race in VT_RESIZEX
	staging: android: ashmem: Disallow ashmem memory from being remapped
	staging: vt6656: fix sign of rx_dbm to bb_pre_ed_rssi.
	xhci: Force Maximum Packet size for Full-speed bulk devices to valid range.
	xhci: fix runtime pm enabling for quirky Intel hosts
	xhci: Fix memory leak when caching protocol extended capability PSI tables - take 2
	usb: host: xhci: update event ring dequeue pointer on purpose
	USB: core: add endpoint-blacklist quirk
	USB: quirks: blacklist duplicate ep on Sound Devices USBPre2
	usb: uas: fix a plug & unplug racing
	USB: Fix novation SourceControl XL after suspend
	USB: hub: Don't record a connect-change event during reset-resume
	USB: hub: Fix the broken detection of USB3 device in SMSC hub
	usb: dwc2: Fix SET/CLEAR_FEATURE and GET_STATUS flows
	usb: dwc3: gadget: Check for IOC/LST bit in TRB->ctrl fields
	staging: rtl8188eu: Fix potential security hole
	staging: rtl8188eu: Fix potential overuse of kernel memory
	staging: rtl8723bs: Fix potential security hole
	staging: rtl8723bs: Fix potential overuse of kernel memory
	powerpc/tm: Fix clearing MSR[TS] in current when reclaiming on signal delivery
	jbd2: fix ocfs2 corrupt when clearing block group bits
	x86/mce/amd: Publish the bank pointer only after setup has succeeded
	x86/mce/amd: Fix kobject lifetime
	x86/cpu/amd: Enable the fixed Instructions Retired counter IRPERF
	serial: 8250: Check UPF_IRQ_SHARED in advance
	tty/serial: atmel: manage shutdown in case of RS485 or ISO7816 mode
	tty: serial: imx: setup the correct sg entry for tx dma
	serdev: ttyport: restore client ops on deregistration
	MAINTAINERS: Update drm/i915 bug filing URL
	Revert "ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()"
	mm/memcontrol.c: lost css_put in memcg_expand_shrinker_maps()
	nvme-multipath: Fix memory leak with ana_log_buf
	genirq/irqdomain: Make sure all irq domain flags are distinct
	mm/vmscan.c: don't round up scan size for online memory cgroup
	drm/amdgpu/soc15: fix xclk for raven
	xhci: apply XHCI_PME_STUCK_QUIRK to Intel Comet Lake platforms
	KVM: nVMX: Don't emulate instructions in guest mode
	KVM: x86: don't notify userspace IOAPIC on edge-triggered interrupt EOI
	tty: serial: qcom_geni_serial: Fix UART hang
	tty: serial: qcom_geni_serial: Remove interrupt storm
	tty: serial: qcom_geni_serial: Remove use of *_relaxed() and mb()
	tty: serial: qcom_geni_serial: Remove set_rfr_wm() and related variables
	tty: serial: qcom_geni_serial: Remove xfer_mode variable
	tty: serial: qcom_geni_serial: Fix RX cancel command failure
	lib/stackdepot.c: fix global out-of-bounds in stack_slabs
	drm/nouveau/kms/gv100-: Re-set LUT after clearing for modesets
	ext4: fix a data race in EXT4_I(inode)->i_disksize
	ext4: add cond_resched() to __ext4_find_entry()
	ext4: fix potential race between online resizing and write operations
	ext4: fix potential race between s_group_info online resizing and access
	ext4: fix potential race between s_flex_groups online resizing and access
	ext4: fix mount failure with quota configured as module
	ext4: rename s_journal_flag_rwsem to s_writepages_rwsem
	ext4: fix race between writepages and enabling EXT4_EXTENTS_FL
	KVM: nVMX: Refactor IO bitmap checks into helper function
	KVM: nVMX: Check IO instruction VM-exit conditions
	KVM: nVMX: handle nested posted interrupts when apicv is disabled for L1
	KVM: apic: avoid calculating pending eoi from an uninitialized val
	btrfs: fix bytes_may_use underflow in prealloc error condtition
	btrfs: reset fs_root to NULL on error in open_ctree
	btrfs: do not check delayed items are empty for single transaction cleanup
	Btrfs: fix btrfs_wait_ordered_range() so that it waits for all ordered extents
	Revert "dmaengine: imx-sdma: Fix memory leak"
	scsi: Revert "RDMA/isert: Fix a recently introduced regression related to logout"
	scsi: Revert "target: iscsi: Wait for all commands to finish before freeing a session"
	usb: gadget: composite: Fix bMaxPower for SuperSpeedPlus
	usb: dwc2: Fix in ISOC request length checking
	staging: rtl8723bs: fix copy of overlapping memory
	staging: greybus: use after free in gb_audio_manager_remove_all()
	ecryptfs: replace BUG_ON with error handling code
	iommu/vt-d: Fix compile warning from intel-svm.h
	genirq/proc: Reject invalid affinity masks (again)
	bpf, offload: Replace bitwise AND by logical AND in bpf_prog_offload_info_fill
	ALSA: rawmidi: Avoid bit fields for state flags
	ALSA: seq: Avoid concurrent access to queue flags
	ALSA: seq: Fix concurrent access to queue current tick/time
	netfilter: xt_hashlimit: limit the max size of hashtable
	rxrpc: Fix call RCU cleanup using non-bh-safe locks
	ata: ahci: Add shutdown to freeze hardware resources of ahci
	xen: Enable interrupts when calling _cond_resched()
	s390/mm: Explicitly compare PAGE_DEFAULT_KEY against zero in storage_key_init_range
	Revert "char/random: silence a lockdep splat with printk()"
	Linux 4.19.107

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I74e3d49c54d4afcfa4049042163cb879c3de3100
parents f78dc61d a083db76

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7353,7 +7353,7 @@ M: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> 
M:	Rodrigo Vivi <rodrigo.vivi@intel.com>

L:	intel-gfx@lists.freedesktop.org

W:	https://01.org/linuxgraphics/

B:	https://01.org/linuxgraphics/documentation/how-report-bugs

B:	https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs

C:	irc://chat.freenode.net/intel-gfx

Q:	http://patchwork.freedesktop.org/project/intel-gfx/

T:	git git://anongit.freedesktop.org/drm-intel

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 106

SUBLEVEL = 107

EXTRAVERSION =

NAME = "People's Front"

arch/powerpc/kernel/signal.c

+15 −2
Original line number Diff line number Diff line
@@ -200,14 +200,27 @@ unsigned long get_tm_stackpointer(struct task_struct *tsk) 
	 * normal/non-checkpointed stack pointer.

	 */



	unsigned long ret = tsk->thread.regs->gpr[1];



#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	BUG_ON(tsk != current);



	if (MSR_TM_ACTIVE(tsk->thread.regs->msr)) {

		preempt_disable();

		tm_reclaim_current(TM_CAUSE_SIGNAL);

		if (MSR_TM_TRANSACTIONAL(tsk->thread.regs->msr))

			return tsk->thread.ckpt_regs.gpr[1];

			ret = tsk->thread.ckpt_regs.gpr[1];



		/*

		 * If we treclaim, we must clear the current thread's TM bits

		 * before re-enabling preemption. Otherwise we might be

		 * preempted and have the live MSR[TS] changed behind our back

		 * (tm_recheckpoint_new_task() would recheckpoint). Besides, we

		 * enter the signal handler in non-transactional state.

		 */

		tsk->thread.regs->msr &= ~MSR_TS_MASK;

		preempt_enable();

	}

#endif

	return tsk->thread.regs->gpr[1];

	return ret;

}

arch/powerpc/kernel/signal_32.c

+14 −14
Original line number Diff line number Diff line
@@ -493,19 +493,11 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame, 
 */

static int save_tm_user_regs(struct pt_regs *regs,

			     struct mcontext __user *frame,

			     struct mcontext __user *tm_frame, int sigret)

			     struct mcontext __user *tm_frame, int sigret,

			     unsigned long msr)

{

	unsigned long msr = regs->msr;



	WARN_ON(tm_suspend_disabled);



	/* Remove TM bits from thread's MSR.  The MSR in the sigcontext

	 * just indicates to userland that we were doing a transaction, but we

	 * don't want to return in transactional state.  This also ensures

	 * that flush_fp_to_thread won't set TIF_RESTORE_TM again.

	 */

	regs->msr &= ~MSR_TS_MASK;



	/* Save both sets of general registers */

	if (save_general_regs(&current->thread.ckpt_regs, frame)

	    || save_general_regs(regs, tm_frame))
@@ -916,6 +908,10 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset, 
	int sigret;

	unsigned long tramp;

	struct pt_regs *regs = tsk->thread.regs;

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	/* Save the thread's msr before get_tm_stackpointer() changes it */

	unsigned long msr = regs->msr;

#endif



	BUG_ON(tsk != current);
@@ -948,13 +944,13 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset, 


#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	tm_frame = &rt_sf->uc_transact.uc_mcontext;

	if (MSR_TM_ACTIVE(regs->msr)) {

	if (MSR_TM_ACTIVE(msr)) {

		if (__put_user((unsigned long)&rt_sf->uc_transact,

			       &rt_sf->uc.uc_link) ||

		    __put_user((unsigned long)tm_frame,

			       &rt_sf->uc_transact.uc_regs))

			goto badframe;

		if (save_tm_user_regs(regs, frame, tm_frame, sigret))

		if (save_tm_user_regs(regs, frame, tm_frame, sigret, msr))

			goto badframe;

	}

	else
@@ -1365,6 +1361,10 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset, 
	int sigret;

	unsigned long tramp;

	struct pt_regs *regs = tsk->thread.regs;

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	/* Save the thread's msr before get_tm_stackpointer() changes it */

	unsigned long msr = regs->msr;

#endif



	BUG_ON(tsk != current);
@@ -1398,9 +1398,9 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset, 


#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	tm_mctx = &frame->mctx_transact;

	if (MSR_TM_ACTIVE(regs->msr)) {

	if (MSR_TM_ACTIVE(msr)) {

		if (save_tm_user_regs(regs, &frame->mctx, &frame->mctx_transact,

				      sigret))

				      sigret, msr))

			goto badframe;

	}

	else

arch/powerpc/kernel/signal_64.c

+10 −12
Original line number Diff line number Diff line
@@ -196,7 +196,8 @@ static long setup_sigcontext(struct sigcontext __user *sc, 
static long setup_tm_sigcontexts(struct sigcontext __user *sc,

				 struct sigcontext __user *tm_sc,

				 struct task_struct *tsk,

				 int signr, sigset_t *set, unsigned long handler)

				 int signr, sigset_t *set, unsigned long handler,

				 unsigned long msr)

{

	/* When CONFIG_ALTIVEC is set, we _always_ setup v_regs even if the

	 * process never used altivec yet (MSR_VEC is zero in pt_regs of
@@ -211,12 +212,11 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc, 
	elf_vrreg_t __user *tm_v_regs = sigcontext_vmx_regs(tm_sc);

#endif

	struct pt_regs *regs = tsk->thread.regs;

	unsigned long msr = tsk->thread.regs->msr;

	long err = 0;



	BUG_ON(tsk != current);



	BUG_ON(!MSR_TM_ACTIVE(regs->msr));

	BUG_ON(!MSR_TM_ACTIVE(msr));



	WARN_ON(tm_suspend_disabled);
@@ -226,13 +226,6 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc, 
	 */

	msr |= tsk->thread.ckpt_regs.msr & (MSR_FP | MSR_VEC | MSR_VSX);



	/* Remove TM bits from thread's MSR.  The MSR in the sigcontext

	 * just indicates to userland that we were doing a transaction, but we

	 * don't want to return in transactional state.  This also ensures

	 * that flush_fp_to_thread won't set TIF_RESTORE_TM again.

	 */

	regs->msr &= ~MSR_TS_MASK;



#ifdef CONFIG_ALTIVEC

	err |= __put_user(v_regs, &sc->v_regs);

	err |= __put_user(tm_v_regs, &tm_sc->v_regs);
@@ -803,6 +796,10 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, 
	unsigned long newsp = 0;

	long err = 0;

	struct pt_regs *regs = tsk->thread.regs;

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	/* Save the thread's msr before get_tm_stackpointer() changes it */

	unsigned long msr = regs->msr;

#endif



	BUG_ON(tsk != current);
@@ -820,7 +817,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, 
	err |= __put_user(0, &frame->uc.uc_flags);

	err |= __save_altstack(&frame->uc.uc_stack, regs->gpr[1]);

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	if (MSR_TM_ACTIVE(regs->msr)) {

	if (MSR_TM_ACTIVE(msr)) {

		/* The ucontext_t passed to userland points to the second

		 * ucontext_t (for transactional state) with its uc_link ptr.

		 */
@@ -828,7 +825,8 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, 
		err |= setup_tm_sigcontexts(&frame->uc.uc_mcontext,

					    &frame->uc_transact.uc_mcontext,

					    tsk, ksig->sig, NULL,

					    (unsigned long)ksig->ka.sa.sa_handler);

					    (unsigned long)ksig->ka.sa.sa_handler,

					    msr);

	} else

#endif

	{