diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-07-30 07:38:09 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-07-30 07:38:09 +0200 |
commit | cfe89cac17a42ee499360b1cbc34c89453340b8c (patch) | |
tree | 4aa4029b982180d966f6197fb945fe081330ab5c /KEYS-potential-uninitialized-variable.patch | |
parent | 3f28a113a559f991c09ee6070a4be933aa372de3 (diff) | |
parent | 8eb58679e79713ca8b9c79c4e3ea6d4c1822b40b (diff) | |
download | kernel-4.6.5-200.vanilla.knurd.1.fc23.tar.gz kernel-4.6.5-200.vanilla.knurd.1.fc23.tar.xz kernel-4.6.5-200.vanilla.knurd.1.fc23.zip |
Merge remote-tracking branch 'origin/f23' into f23-user-thl-vanilla-fedorakernel-4.6.5-200.vanilla.knurd.1.fc23
Diffstat (limited to 'KEYS-potential-uninitialized-variable.patch')
-rw-r--r-- | KEYS-potential-uninitialized-variable.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/KEYS-potential-uninitialized-variable.patch b/KEYS-potential-uninitialized-variable.patch deleted file mode 100644 index 23cabbb2e..000000000 --- a/KEYS-potential-uninitialized-variable.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 - |