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

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

Merge 4.19.206 into android-4.19-stable 



Changes in 4.19.206
	net: qrtr: fix another OOB Read in qrtr_endpoint_post
	bpf: Do not use ax register in interpreter on div/mod
	bpf: Fix 32 bit src register truncation on div/mod
	bpf: Fix truncation handling for mod32 dst reg wrt zero
	ARC: Fix CONFIG_STACKDEPOT
	netfilter: conntrack: collect all entries in one cycle
	once: Fix panic when module unload
	can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters
	Revert "USB: serial: ch341: fix character loss at high transfer rates"
	USB: serial: option: add new VID/PID to support Fibocom FG150
	usb: dwc3: gadget: Fix dwc3_calc_trbs_left()
	usb: dwc3: gadget: Stop EP0 transfers during pullup disable
	IB/hfi1: Fix possible null-pointer dereference in _extend_sdma_tx_descs()
	e1000e: Fix the max snoop/no-snoop latency for 10M
	ip_gre: add validation for csum_start
	xgene-v2: Fix a resource leak in the error handling path of 'xge_probe()'
	net: marvell: fix MVNETA_TX_IN_PRGRS bit number
	net: hns3: fix get wrong pfc_en when query PFC configuration
	usb: gadget: u_audio: fix race condition on endpoint stop
	opp: remove WARN when no valid OPPs remain
	virtio: Improve vq->broken access to avoid any compiler optimization
	virtio_pci: Support surprise removal of virtio pci device
	vringh: Use wiov->used to check for read/write desc order
	qed: qed ll2 race condition fixes
	qed: Fix null-pointer dereference in qed_rdma_create_qp()
	drm: Copy drm_wait_vblank to user before returning
	drm/nouveau/disp: power down unused DP links during init
	net/rds: dma_map_sg is entitled to merge entries
	vt_kdsetmode: extend console locking
	fbmem: add margin check to fb_check_caps()
	KVM: x86/mmu: Treat NX as used (not reserved) for all !TDP shadow MMUs
	Revert "floppy: reintroduce O_NDELAY fix"
	net: don't unconditionally copy_from_user a struct ifreq for socket ioctls
	Linux 4.19.206

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I04e05680c5e311bc4cd79daae49d654b66f774a0
parents b0c5b896 b172b44f

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 205

SUBLEVEL = 206

EXTRAVERSION =

NAME = "People's Front"

arch/arc/kernel/vmlinux.lds.S

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ SECTIONS 
		CPUIDLE_TEXT

		LOCK_TEXT

		KPROBES_TEXT

		IRQENTRY_TEXT

		SOFTIRQENTRY_TEXT

		*(.fixup)

		*(.gnu.warning)

	}

arch/x86/kvm/mmu.c

+10 −1
Original line number Diff line number Diff line
@@ -4557,7 +4557,16 @@ static void reset_rsvds_bits_mask_ept(struct kvm_vcpu *vcpu, 
void

reset_shadow_zero_bits_mask(struct kvm_vcpu *vcpu, struct kvm_mmu *context)

{

	bool uses_nx = context->nx || context->base_role.smep_andnot_wp;

	/*

	 * KVM uses NX when TDP is disabled to handle a variety of scenarios,

	 * notably for huge SPTEs if iTLB multi-hit mitigation is enabled and

	 * to generate correct permissions for CR0.WP=0/CR4.SMEP=1/EFER.NX=0.

	 * The iTLB multi-hit workaround can be toggled at any time, so assume

	 * NX can be used by any non-nested shadow MMU to avoid having to reset

	 * MMU contexts.  Note, KVM forces EFER.NX=1 when TDP is disabled.

	 */

	bool uses_nx = context->nx || !tdp_enabled ||

		context->base_role.smep_andnot_wp;

	struct rsvd_bits_validate *shadow_zero_check;

	int i;

drivers/block/floppy.c

+13 −14
Original line number Diff line number Diff line
@@ -4074,6 +4074,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) 
	if (UFDCS->rawcmd == 1)

		UFDCS->rawcmd = 2;



	if (!(mode & FMODE_NDELAY)) {

		if (mode & (FMODE_READ|FMODE_WRITE)) {

			UDRS->last_checked = 0;

			clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);
@@ -4083,13 +4084,11 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) 
			if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags))

				goto out;

		}



		res = -EROFS;



		if ((mode & FMODE_WRITE) &&

		    !test_bit(FD_DISK_WRITABLE_BIT, &UDRS->flags))

			goto out;



	}

	mutex_unlock(&open_lock);

	mutex_unlock(&floppy_mutex);

	return 0;

drivers/gpu/drm/drm_ioc32.c

+1 −3
Original line number Diff line number Diff line
@@ -855,8 +855,6 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd, 
	req.request.sequence = req32.request.sequence;

	req.request.signal = req32.request.signal;

	err = drm_ioctl_kernel(file, drm_wait_vblank_ioctl, &req, DRM_UNLOCKED);

	if (err)

		return err;



	req32.reply.type = req.reply.type;

	req32.reply.sequence = req.reply.sequence;
@@ -865,7 +863,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd, 
	if (copy_to_user(argp, &req32, sizeof(req32)))

		return -EFAULT;



	return 0;

	return err;

}



#if defined(CONFIG_X86)