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

Unverified Commit 3be1d212 authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.302 kernel 

Changes in 4.4.302: (27 commits)
        can: bcm: fix UAF of bcm op
        Bluetooth: refactor malicious adv data check
        s390/hypfs: include z/VM guests with access control group set
        scsi: zfcp: Fix failed recovery on gone remote port with non-NPIV FCP devices
        udf: Restore i_lenAlloc when inode expansion fails
        udf: Fix NULL ptr deref when converting from inline format
        PM: wakeup: simplify the output logic of pm_show_wakelocks()
        serial: stm32: fix software flow control transfer
        tty: n_gsm: fix SW flow control encoding/handling
        tty: Add support for Brainboxes UC cards.
        usb-storage: Add unusual-devs entry for VL817 USB-SATA bridge
        USB: core: Fix hang in usb_kill_urb by adding memory barriers
        scsi: bnx2fc: Flush destroy_work queue before calling bnx2fc_interface_put()
        ipv6_tunnel: Rate limit warning messages
        net: fix information leakage in /proc/net/ptype
        ipv4: avoid using shared IP generator for connected sockets
        net-procfs: show net devices bound packet types
        drm/msm: Fix wrong size calculation
        hwmon: (lm90) Reduce maximum conversion rate for G781
        ipv4: raw: lock the socket in raw_bind()
        ipv4: tcp: send zero IPID in SYNACK messages
        Bluetooth: MGMT: Fix misplaced BT_HS check
        Revert "drm/radeon/ci: disable mclk switching for high refresh rates (v2)"
        Revert "tc358743: fix register i2c_rd/wr function fix"
        KVM: x86: Fix misplaced backport of "work around leak of uninitialized stack contents"
        Input: i8042 - Fix misplaced backport of "add ASUS Zenbook Flip to noselftest list"
        Linux 4.4.302
parents a11dda58 a09b2d8f

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 301

SUBLEVEL = 302

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/s390/hypfs/hypfs_vm.c

+4 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


static char local_guest[] = "        ";

static char all_guests[] = "*       ";

static char *all_groups = all_guests;

static char *guest_query;



struct diag2fc_data {
@@ -61,10 +62,11 @@ static int diag2fc(int size, char* query, void *addr) 


	memcpy(parm_list.userid, query, NAME_LEN);

	ASCEBC(parm_list.userid, NAME_LEN);

	memcpy(parm_list.aci_grp, all_groups, NAME_LEN);

	ASCEBC(parm_list.aci_grp, NAME_LEN);

	parm_list.addr = (unsigned long)addr;

	parm_list.size = size;

	parm_list.fmt = 0x02;

	memset(parm_list.aci_grp, 0x40, NAME_LEN);

	rc = -1;



	diag_stat_inc(DIAG_STAT_X2FC);

arch/x86/kvm/x86.c

+7 −7
Original line number Diff line number Diff line
@@ -4417,13 +4417,6 @@ static int emulator_write_std(struct x86_emulate_ctxt *ctxt, gva_t addr, void *v 
	if (!system && kvm_x86_ops->get_cpl(vcpu) == 3)

		access |= PFERR_USER_MASK;



	/*

	 * FIXME: this should call handle_emulation_failure if X86EMUL_IO_NEEDED

	 * is returned, but our callers are not ready for that and they blindly

	 * call kvm_inject_page_fault.  Ensure that they at least do not leak

	 * uninitialized kernel stack memory into cr2 and error code.

	 */

	memset(exception, 0, sizeof(*exception));

	return kvm_write_guest_virt_helper(addr, val, bytes, vcpu,

					   access, exception);

}
@@ -4431,6 +4424,13 @@ static int emulator_write_std(struct x86_emulate_ctxt *ctxt, gva_t addr, void *v 
int kvm_write_guest_virt_system(struct kvm_vcpu *vcpu, gva_t addr, void *val,

				unsigned int bytes, struct x86_exception *exception)

{

	/*

	 * FIXME: this should call handle_emulation_failure if X86EMUL_IO_NEEDED

	 * is returned, but our callers are not ready for that and they blindly

	 * call kvm_inject_page_fault.  Ensure that they at least do not leak

	 * uninitialized kernel stack memory into cr2 and error code.

	 */

	memset(exception, 0, sizeof(*exception));

	return kvm_write_guest_virt_helper(addr, val, bytes, vcpu,

					   PFERR_WRITE_MASK, exception);

}

drivers/gpu/drm/msm/msm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static int msm_init_vram(struct drm_device *dev) 
		ret = of_address_to_resource(node, 0, &r);

		if (ret)

			return ret;

		size = r.end - r.start;

		size = r.end - r.start + 1;

		DRM_INFO("using VRAM carveout: %lx@%pa\n", size, &r.start);

	} else

#endif

drivers/gpu/drm/radeon/ci_dpm.c

+0 −6
Original line number Diff line number Diff line
@@ -776,12 +776,6 @@ bool ci_dpm_vblank_too_short(struct radeon_device *rdev) 
	u32 vblank_time = r600_dpm_get_vblank_time(rdev);

	u32 switch_limit = pi->mem_gddr5 ? 450 : 300;



	/* disable mclk switching if the refresh is >120Hz, even if the

        * blanking period would allow it

        */

	if (r600_dpm_get_vrefresh(rdev) > 120)

		return true;



	/* disable mclk switching if the refresh is >120Hz, even if the

        * blanking period would allow it

        */