rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CVE-2016-4470 keys: uninitialized variable crash (rhbz 1341716 1346626)

This commit is contained in:
Josh Boyer 2016-06-15 09:37:42 -04:00
parent e1344c869b
commit 1a38d3b0f3
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
KEYS-potential-uninitialized-variable.patch Normal file
View File

@ -0,0 +1,30 @@
From 82a50018782f84e733e718d4b24e1653d19333be Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 15 Jun 2016 09:31:45 -0400
Subject: [PATCH] KEYS: potential uninitialized variable
If __key_link_begin() failed then "edit" would be uninitialized. I've
added a check to fix that.
Fixes: f70e2e06196a ('KEYS: Do preallocation for __key_link()')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
security/keys/key.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/keys/key.c b/security/keys/key.c
index bd5a272f28a6..346fbf201c22 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -597,7 +597,7 @@ int key_reject_and_link(struct key *key,
mutex_unlock(&key_construction_mutex);
- if (keyring)
+ if (keyring && link_ret == 0)
__key_link_end(keyring, &key->index_key, edit);
/* wake up anyone waiting for a key to be constructed */
--
2.5.5

9
kernel.spec
View File

@ -653,6 +653,9 @@ Patch724: ecryptfs-fix-handling-of-directory-opening.patch
Patch725: ecryptfs-forbid-opening-files-without-mmap-handler.patch
Patch726: sched-panic-on-corrupted-stack-end.patch
#CVE-2016-4470 rhbz 1341716 1346626
Patch727: KEYS-potential-uninitialized-variable.patch
# END OF PATCH DEFINITIONS
%endif
@ -1367,6 +1370,9 @@ ApplyPatch ecryptfs-fix-handling-of-directory-opening.patch
ApplyPatch ecryptfs-forbid-opening-files-without-mmap-handler.patch
ApplyPatch sched-panic-on-corrupted-stack-end.patch
#CVE-2016-4470 rhbz 1341716 1346626
ApplyPatch KEYS-potential-uninitialized-variable.patch
# END OF PATCH APPLICATIONS
%endif
@ -2216,6 +2222,9 @@ fi
#
#
%changelog
* Wed Jun 15 2016 Josh Boyer <jwboyer@fedoraproject.org>
- CVE-2016-4470 keys: uninitialized variable crash (rhbz 1341716 1346626)
* Mon Jun 13 2016 Josh Boyer <jwboyer@fedoraproject.org>
- CVE-2016-1583 stack overflow via ecryptfs and /proc (rhbz 1344721 1344722)