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

CVE-2014-0102 keyctl_link can be used to cause an oops (rhbz 1071396)

This commit is contained in:
Josh Boyer 2014-02-28 11:48:34 -05:00
parent a221e18914
commit 6162a001a7
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel.spec
View File

@ -764,6 +764,9 @@ Patch25024: e100-Fix-disabling-already-disabled-device-warning.patch
#rhbz 1056170
Patch25025: usb-ehci-fix-deadlock-when-threadirqs-option-is-used.patch
#CVE-2014-0102 rhbz 1071396
Patch25026: keyring-fix.patch
# END OF PATCH DEFINITIONS
%endif
@ -1484,6 +1487,8 @@ ApplyPatch e100-Fix-disabling-already-disabled-device-warning.patch
#rhbz 1056170
ApplyPatch usb-ehci-fix-deadlock-when-threadirqs-option-is-used.patch
#CVE-2014-0102 rhbz 1071396
ApplyPatch keyring-fix.patch
# END OF PATCH APPLICATIONS
@ -2296,6 +2301,9 @@ fi
# ||----w |
# || ||
%changelog
* Fri Feb 28 2014 Josh Boyer <jwboyer@fedoraproject.org>
- CVE-2014-0102 keyctl_link can be used to cause an oops (rhbz 1071396)
* Fri Feb 28 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Drop alx phy reset patch that is already in 3.13

17
keyring-fix.patch Normal file
View File

@ -0,0 +1,17 @@
@@ -, +, @@
---
--- a/security/keys/keyring.c
+++ a/security/keys/keyring.c
@@ -1000,7 +1000,11 @@ static int keyring_detect_cycle_iterator(const void *object,
kenter("{%d}", key->serial);
- BUG_ON(key != ctx->match_data);
+ /* We might get a keyring with matching index-key that is nonetheless a
+ * different keyring. */
+ if (key != ctx->match_data)
+ return 0;
+
ctx->result = ERR_PTR(-EDEADLK);
return 1;
}