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

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

Merge 4.9.57 into android-4.9-o 



Changes in 4.9.57
	ext4: in ext4_seek_{hole,data}, return -ENXIO for negative offsets
	CIFS: Reconnect expired SMB sessions
	nl80211: Define policy for packet pattern attributes
	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
	dmaengine: ti-dma-crossbar: Fix possible race condition with dma_inuse
	HID: usbhid: fix out-of-bounds bug
	crypto: shash - Fix zero-length shash ahash digest crash
	KVM: MMU: always terminate page walks at level 1
	KVM: nVMX: fix guest CR4 loading when emulating L2 to L1 exit
	usb: renesas_usbhs: Fix DMAC sequence for receiving zero-length packet
	pinctrl/amd: Fix build dependency on pinmux code
	iommu/amd: Finish TLB flush in amd_iommu_unmap()
	device property: Track owner device of device property
	fs/mpage.c: fix mpage_writepage() for pages with buffers
	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 missing initialization before error path
	ALSA: line6: Fix leftover URB at error-path during probe
	drm/i915/edp: Get the Panel Power Off timestamp after panel is off
	drm/i915: Read timings from the correct transcoder in intel_crtc_mode_get()
	drm/i915/bios: parse DDI ports also for CHV for HDMI DDC pin and DP AUX channel
	usb: gadget: configfs: Fix memory leak of interface directory data
	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
	more bio_map_user_iov() leak fixes
	bio_copy_user_iov(): don't ignore ->iov_offset
	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()
	KVM: nVMX: update last_nonleaf_level when initializing nested EPT
	Linux 4.9.57

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 05a906d7 5d7a76ac

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 56

SUBLEVEL = 57

EXTRAVERSION =

NAME = Roaring Lionus

arch/mips/math-emu/cp1emu.c

+0 −2
Original line number Diff line number Diff line
@@ -2386,7 +2386,6 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, 
					break;

				default:

					/* Reserved R6 ops */

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

					return SIGILL;

				}

			}
@@ -2460,7 +2459,6 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, 
					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
@@ -103,12 +103,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/mmu.c

+8 −7
Original line number Diff line number Diff line
@@ -3648,13 +3648,6 @@ static bool sync_mmio_spte(struct kvm_vcpu *vcpu, u64 *sptep, gfn_t gfn, 
static inline bool is_last_gpte(struct kvm_mmu *mmu,

				unsigned level, unsigned gpte)

{

	/*

	 * PT_PAGE_TABLE_LEVEL always terminates.  The RHS has bit 7 set

	 * iff level <= PT_PAGE_TABLE_LEVEL, which for our purpose means

	 * level == PT_PAGE_TABLE_LEVEL; set PT_PAGE_SIZE_MASK in gpte then.

	 */

	gpte |= level - PT_PAGE_TABLE_LEVEL - 1;



	/*

	 * The RHS has bit 7 set iff level < mmu->last_nonleaf_level.

	 * If it is clear, there are no large pages at this level, so clear
@@ -3662,6 +3655,13 @@ static inline bool is_last_gpte(struct kvm_mmu *mmu, 
	 */

	gpte &= level - mmu->last_nonleaf_level;



	/*

	 * PT_PAGE_TABLE_LEVEL always terminates.  The RHS has bit 7 set

	 * iff level <= PT_PAGE_TABLE_LEVEL, which for our purpose means

	 * level == PT_PAGE_TABLE_LEVEL; set PT_PAGE_SIZE_MASK in gpte then.

	 */

	gpte |= level - PT_PAGE_TABLE_LEVEL - 1;



	return gpte & PT_PAGE_SIZE_MASK;

}
@@ -4169,6 +4169,7 @@ void kvm_init_shadow_ept_mmu(struct kvm_vcpu *vcpu, bool execonly) 


	update_permission_bitmask(vcpu, context, true);

	update_pkru_bitmask(vcpu, context, true);

	update_last_nonleaf_level(vcpu, context);

	reset_rsvds_bits_mask_ept(vcpu, context, execonly);

	reset_ept_shadow_zero_bits_mask(vcpu, context, execonly);

}