Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc7.git2.1.vanilla.knurd.1.fc26kernel-4.9.0-0.rc7.git2.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc7.git2.1.vanilla.knurd.1.fc24kernel-4.9.0-0.rc7.git2.1.vanilla.knurd.1.fc23

4 files changed, 6 insertions, 63 deletions

diff --git a/Fix-BUG-in-calc_seckey.patch b/Fix-BUG-in-calc_seckey.patch
deleted file mode 100644
index e5b667975..000000000
--- a/Fix-BUG-in-calc_seckey.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From patchwork Mon Oct 17 20:40:22 2016
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: Fix BUG() in calc_seckey()
-From: Sachin Prabhu <sprabhu@redhat.com>
-X-Patchwork-Id: 9380527
-Message-Id: <1476736822-30098-1-git-send-email-sprabhu@redhat.com>
-To: linux-cifs <linux-cifs@vger.kernel.org>
-Date: Mon, 17 Oct 2016 16:40:22 -0400
-
-Andy Lutromirski's new virtually mapped kernel stack allocations moves
-kernel stacks the vmalloc area. This triggers the bug
- kernel BUG at ./include/linux/scatterlist.h:140!
-at calc_seckey()->sg_init()
-
-Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
-Reviewed-by: Jeff Layton <jlayton@redhat.com>
----
- fs/cifs/cifsencrypt.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c
-index 8347c90..5eb0412 100644
---- a/fs/cifs/cifsencrypt.c
-+++ b/fs/cifs/cifsencrypt.c
-@@ -808,7 +808,11 @@ calc_seckey(struct cifs_ses *ses)
- 	struct crypto_skcipher *tfm_arc4;
- 	struct scatterlist sgin, sgout;
- 	struct skcipher_request *req;
--	unsigned char sec_key[CIFS_SESS_KEY_SIZE]; /* a nonce */
-+	unsigned char *sec_key;
-+
-+	sec_key = kmalloc(CIFS_SESS_KEY_SIZE, GFP_KERNEL);
-+	if (sec_key == NULL)
-+		return -ENOMEM;
- 
- 	get_random_bytes(sec_key, CIFS_SESS_KEY_SIZE);
- 
-@@ -816,7 +820,7 @@ calc_seckey(struct cifs_ses *ses)
- 	if (IS_ERR(tfm_arc4)) {
- 		rc = PTR_ERR(tfm_arc4);
- 		cifs_dbg(VFS, "could not allocate crypto API arc4\n");
--		return rc;
-+		goto out;
- 	}
- 
- 	rc = crypto_skcipher_setkey(tfm_arc4, ses->auth_key.response,
-@@ -854,7 +858,8 @@ calc_seckey(struct cifs_ses *ses)
- 
- out_free_cipher:
- 	crypto_free_skcipher(tfm_arc4);
--
-+out:
-+	kfree(sec_key);
- 	return rc;
- }
- 
diff --git a/gitrev b/gitrev
index 6fda0478b..818300e56 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-88abd8249ee8bcebb98c90e890ea5e342db832af
+ded6e842cf499ef04b0d611d92b859d5b846c497
diff --git a/kernel.spec b/kernel.spec
index 5ab91737b..420f08763 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 7
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -638,8 +638,6 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
 #ongoing complaint, full discussion delayed until ksummit/plumbers
 Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch
 
-Patch850: Fix-BUG-in-calc_seckey.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2190,6 +2188,9 @@ fi
 #
 #
 %changelog
+* Wed Nov 30 2016 Laura Abbott <labbott@fedoraproject.org> - 4.9.0-0.rc7.git2.1
+- Linux v4.9-rc7-23-gded6e84
+
 * Tue Nov 29 2016 Peter Robinson <pbrobinson@fedoraproject.org>
 - Add upstream i.MX6sx Udoo NEO support
 
diff --git a/sources b/sources
index 5351b393f..a81768e56 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 c1af0afbd3df35c1ccdc7a5118cd2d07  linux-4.8.tar.xz
 0dad03f586e835d538d3e0d2cbdb9a28  perf-man-4.8.tar.gz
 494621f869edb41dc1e71ae9bd9c525d  patch-4.9-rc7.xz
-b1351a61308b7d8261ad026a69983061  patch-4.9-rc7-git1.xz
+203c204064e0b6e72bc2a2c2048ae9d8  patch-4.9-rc7-git2.xz