diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-06-15 09:37:42 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-06-15 09:53:49 -0400 |
| commit | 6e89960c9117356a5a42ef89e2842329c0e0a07a (patch) | |
| tree | 89855f1ca1df4f5d552becb4db551fcfc33c5f02 | |
| parent | 7876ded218ef61c31302c1c21005fda5d05018c9 (diff) | |
| download | kernel-6e89960c9117356a5a42ef89e2842329c0e0a07a.tar.gz kernel-6e89960c9117356a5a42ef89e2842329c0e0a07a.tar.xz kernel-6e89960c9117356a5a42ef89e2842329c0e0a07a.zip | |
CVE-2016-4470 keys: uninitialized variable crash (rhbz 1341716 1346626)
| -rw-r--r-- | KEYS-potential-uninitialized-variable.patch | 30 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 36 insertions, 0 deletions
diff --git a/KEYS-potential-uninitialized-variable.patch b/KEYS-potential-uninitialized-variable.patch new file mode 100644 index 000000000..23cabbb2e --- /dev/null +++ b/KEYS-potential-uninitialized-variable.patch @@ -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 + diff --git a/kernel.spec b/kernel.spec index 1e8215251..1332fa55b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -605,6 +605,9 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch #rhbz 1346145 Patch666: ath9k-fix-GPIO-mask-for-AR9462-and-AR9565.patch +#CVE-2016-4470 rhbz 1341716 1346626 +Patch727: KEYS-potential-uninitialized-variable.patch + # END OF PATCH DEFINITIONS %endif @@ -2130,6 +2133,9 @@ fi # # %changelog +* Wed Jun 15 2016 Josh Boyer <jwboyer@fedoraproject.org> +- CVE-2016-4470 keys: uninitialized variable crash (rhbz 1341716 1346626) + * Wed Jun 15 2016 Peter Robinson <pbrobinson@fedoraproject.org> - Enable support for TI dm81xx devices (kwizart) |