Merge remote-tracking branch 'origin/f24' into f24-user-thl-vanilla-fedorakernel-4.8.17-200.vanilla.knurd.1.fc24

3 files changed, 5 insertions, 73 deletions

diff --git a/kernel.spec b/kernel.spec
index 47c5772ef..98451cb1f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -59,7 +59,7 @@ Summary: The Linux kernel
 
 
 # Do we have a -stable update to apply?
-%define stable_update 16
+%define stable_update 17
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -658,9 +658,6 @@ Patch855: 0001-platform-x86-ideapad-laptop-Add-Lenovo-Yoga-910-13IK.patch
 # CVE-2016-9755 rhbz 1400904 1400905
 Patch856: 0001-netfilter-ipv6-nf_defrag-drop-mangled-skb-on-ream-er.patch
 
-# CVE-2016-9588 rhbz 1404924 1404925
-Patch857: kvm-nVMX-allow-L1-to-intercept-software-exceptions.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2191,6 +2188,9 @@ fi
 #
 # 
 %changelog
+* Mon Jan 09 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.17-200
+- Linux v4.8.17
+
 * Fri Jan 06 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.16-200
 - Linux v4.8.16
 
diff --git a/kvm-nVMX-allow-L1-to-intercept-software-exceptions.patch b/kvm-nVMX-allow-L1-to-intercept-software-exceptions.patch
deleted file mode 100644
index b408fc604..000000000
--- a/kvm-nVMX-allow-L1-to-intercept-software-exceptions.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From:   Jim Mattson <jmattson@google.com>

-To:     kvm@vger.kernel.org

-Cc:     Jim Mattson <jmattson@google.com>

-Subject: [PATCH] kvm: nVMX: Allow L1 to intercept software exceptions (#BP and #OF)

-Date:   Wed, 14 Dec 2016 11:41:59 -0800

-

-When L2 exits to L0 due to "exception or NMI", software exceptions

-(#BP and #OF) for which L1 has requested an intercept should be

-handled by L1 rather than L0. Previously, only hardware exceptions

-were forwarded to L1.

-

-Signed-off-by: Jim Mattson <jmattson@google.com>

----

- arch/x86/kvm/vmx.c | 11 +++++------

- 1 file changed, 5 insertions(+), 6 deletions(-)

-

-diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c

-index 5382b82..64774f4 100644

---- a/arch/x86/kvm/vmx.c

-+++ b/arch/x86/kvm/vmx.c

-@@ -1343,10 +1343,10 @@ static inline bool nested_cpu_has_posted_intr(struct vmcs12 *vmcs12)

- 	return vmcs12->pin_based_vm_exec_control & PIN_BASED_POSTED_INTR;

- }

- 

--static inline bool is_exception(u32 intr_info)

-+static inline bool is_nmi(u32 intr_info)

- {

- 	return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))

--		== (INTR_TYPE_HARD_EXCEPTION | INTR_INFO_VALID_MASK);

-+		== (INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK);

- }

- 

- static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,

-@@ -5476,7 +5476,7 @@ static int handle_exception(struct kvm_vcpu *vcpu)

- 	if (is_machine_check(intr_info))

- 		return handle_machine_check(vcpu);

- 

--	if ((intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR)

-+	if (is_nmi(intr_info))

- 		return 1;  /* already handled by vmx_vcpu_run() */

- 

- 	if (is_no_device(intr_info)) {

-@@ -8018,7 +8018,7 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)

- 

- 	switch (exit_reason) {

- 	case EXIT_REASON_EXCEPTION_NMI:

--		if (!is_exception(intr_info))

-+		if (is_nmi(intr_info))

- 			return false;

- 		else if (is_page_fault(intr_info))

- 			return enable_ept;

-@@ -8611,8 +8611,7 @@ static void vmx_complete_atomic_exit(struct vcpu_vmx *vmx)

- 		kvm_machine_check();

- 

- 	/* We need to handle NMIs before interrupts are enabled */

--	if ((exit_intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR &&

--	    (exit_intr_info & INTR_INFO_VALID_MASK)) {

-+	if (is_nmi(exit_intr_info)) {

- 		kvm_before_handle_nmi(&vmx->vcpu);

- 		asm("int $2");

- 		kvm_after_handle_nmi(&vmx->vcpu);

--- 

-2.8.0.rc3.226.g39d4020

-

---

-To unsubscribe from this list: send the line "unsubscribe kvm" in

-the body of a message to majordomo@vger.kernel.org

-More majordomo info at  http://vger.kernel.org/majordomo-info.html

diff --git a/sources b/sources
index 19ed3980c..abfb30321 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.8.tar.xz) = a48a065f21e1c7c4de4cf8ca47b8b8d9a70f86b64e7cfa6e01be490f78895745b9c8790734b1d22182cf1f930fb87eaaa84e62ec8cc1f64ac4be9b949e7c0358
 SHA512 (perf-man-4.8.tar.gz) = 1e9707f1e11808178c1953d4f46e1789a138e9aca7bec89af7a6e209cd91e5301bc582db72cf889baa31dcba8cd3d3b1ceb4e8999ac1544ef17d513e861f2b59
-SHA512 (patch-4.8.16.xz) = b59ce2e0bade676845da2d29eabbf0a596fa4ebfb3b0459fea94d5443b9a0edc4cacc3868dbde1c16787a9097a53822d01f80dd9610a0194d734a4812a66acb1
+SHA512 (patch-4.8.17.xz) = df239d990077cdf697fd487b4b8abb97fe442ac9fac4ed2e90c626560fc15058363310cf40580fd000d4ad55198486594a608544ce9c2bcaf03704415aa45441