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

Commit d6fbbe5e authored by Dmitry Shmidt's avatar Dmitry Shmidt
Browse files

Merge 4.4.93 into android-4.4 



Changes in 4.4.93
	brcmfmac: add length check in brcmf_cfg80211_escan_handler()
	ext4: in ext4_seek_{hole,data}, return -ENXIO for negative offsets
	CIFS: Reconnect expired SMB sessions
	nl80211: Define policy for packet pattern attributes
	iwlwifi: mvm: use IWL_HCMD_NOCOPY for MCAST_FILTER_CMD
	rcu: Allow for page faults in NMI handlers
	USB: dummy-hcd: Fix deadlock caused by disconnect detection
	MIPS: math-emu: Remove pr_err() calls from fpu_emu()
	dmaengine: edma: Align the memcpy acnt array size with the transfer
	HID: usbhid: fix out-of-bounds bug
	crypto: shash - Fix zero-length shash ahash digest crash
	KVM: nVMX: fix guest CR4 loading when emulating L2 to L1 exit
	usb: renesas_usbhs: Fix DMAC sequence for receiving zero-length packet
	iommu/amd: Finish TLB flush in amd_iommu_unmap()
	ALSA: usb-audio: Kill stray URB at exiting
	ALSA: seq: Fix use-after-free at creating a port
	ALSA: seq: Fix copy_from_user() call inside lock
	ALSA: caiaq: Fix stray URB at probe error path
	ALSA: line6: Fix leftover URB at error-path during probe
	usb: gadget: composite: Fix use-after-free in usb_composite_overwrite_options
	direct-io: Prevent NULL pointer access in submit_page_section
	fix unbalanced page refcounting in bio_map_user_iov
	USB: serial: ftdi_sio: add id for Cypress WICED dev board
	USB: serial: cp210x: add support for ELV TFD500
	USB: serial: option: add support for TP-Link LTE module
	USB: serial: qcserial: add Dell DW5818, DW5819
	USB: serial: console: fix use-after-free after failed setup
	x86/alternatives: Fix alt_max_short macro to really be a max()
	Linux 4.4.93

Change-Id: I731bf1eef5aca9728dddd23bfbe407f0c6ff2d84
Signed-off-by: default avatarDmitry Shmidt <dimitrysh@google.com>
parents 02049f88 e1fe3813

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 92

SUBLEVEL = 93

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/mips/math-emu/cp1emu.c

+0 −2
Original line number Diff line number Diff line
@@ -2360,7 +2360,6 @@ dcopuop: 
					break;

				default:

					/* Reserved R6 ops */

					pr_err("Reserved MIPS R6 CMP.condn.S operation\n");

					return SIGILL;

				}

			}
@@ -2434,7 +2433,6 @@ dcopuop: 
					break;

				default:

					/* Reserved R6 ops */

					pr_err("Reserved MIPS R6 CMP.condn.D operation\n");

					return SIGILL;

				}

			}

arch/x86/include/asm/alternative-asm.h

+3 −1
Original line number Diff line number Diff line
@@ -62,8 +62,10 @@ 
#define new_len2		145f-144f



/*

 * max without conditionals. Idea adapted from:

 * gas compatible max based on the idea from:

 * http://graphics.stanford.edu/~seander/bithacks.html#IntegerMinOrMax

 *

 * The additional "-" is needed because gas uses a "true" value of -1.

 */

#define alt_max_short(a, b)	((a) ^ (((a) ^ (b)) & -(-((a) < (b)))))

arch/x86/include/asm/alternative.h

+3 −3
Original line number Diff line number Diff line
@@ -102,12 +102,12 @@ static inline int alternatives_text_reserved(void *start, void *end) 
	alt_end_marker ":\n"



/*

 * max without conditionals. Idea adapted from:

 * gas compatible max based on the idea from:

 * http://graphics.stanford.edu/~seander/bithacks.html#IntegerMinOrMax

 *

 * The additional "-" is needed because gas works with s32s.

 * The additional "-" is needed because gas uses a "true" value of -1.

 */

#define alt_max_short(a, b)	"((" a ") ^ (((" a ") ^ (" b ")) & -(-((" a ") - (" b ")))))"

#define alt_max_short(a, b)	"((" a ") ^ (((" a ") ^ (" b ")) & -(-((" a ") < (" b ")))))"



/*

 * Pad the second replacement alternative with additional NOPs if it is

arch/x86/kvm/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -10369,7 +10369,7 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu, 
	 * (KVM doesn't change it)- no reason to call set_cr4_guest_host_mask();

	 */

	vcpu->arch.cr4_guest_owned_bits = ~vmcs_readl(CR4_GUEST_HOST_MASK);

	kvm_set_cr4(vcpu, vmcs12->host_cr4);

	vmx_set_cr4(vcpu, vmcs12->host_cr4);



	nested_ept_uninit_mmu_context(vcpu);