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

Resolves: rhbz1002351

This commit is contained in:
Neil Horman 2013-09-11 11:03:20 -04:00 committed by Josh Boyer
parent 2ce5786276
commit 648716ae03
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
crypto-fix-race-in-larval-lookup.patch Normal file
View File

@ -0,0 +1,44 @@
commit 77dbd7a95e4a4f15264c333a9e9ab97ee27dc2aa
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun Sep 8 14:33:50 2013 +1000
crypto: api - Fix race condition in larval lookup
crypto_larval_lookup should only return a larval if it created one.
Any larval created by another entity must be processed through
crypto_larval_wait before being returned.
Otherwise this will lead to a larval being killed twice, which
will most likely lead to a crash.
Cc: stable@vger.kernel.org
Reported-by: Kees Cook <keescook@chromium.org>
Tested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/crypto/api.c b/crypto/api.c
index 320ea4d..a2b39c5 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -34,6 +34,8 @@ EXPORT_SYMBOL_GPL(crypto_alg_sem);
BLOCKING_NOTIFIER_HEAD(crypto_chain);
EXPORT_SYMBOL_GPL(crypto_chain);
+static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg);
+
struct crypto_alg *crypto_mod_get(struct crypto_alg *alg)
{
return try_module_get(alg->cra_module) ? crypto_alg_get(alg) : NULL;
@@ -144,8 +146,11 @@ static struct crypto_alg *crypto_larval_add(const char *name, u32 type,
}
up_write(&crypto_alg_sem);
- if (alg != &larval->alg)
+ if (alg != &larval->alg) {
kfree(larval);
+ if (crypto_is_larval(alg))
+ alg = crypto_larval_wait(alg);
+ }
return alg;
}

7
kernel.spec
View File

@ -748,6 +748,9 @@ Patch25099: HID-CVE-fixes.patch
#rhbz 963991
Patch26000: acpi-pcie-hotplug-conflict.patch
#rhbz 1002351
Patch25100: crypto-fix-race-in-larval-lookup.patch
# END OF PATCH DEFINITIONS
%endif
@ -1444,6 +1447,9 @@ ApplyPatch rt2800-rearrange-bbp-rfcsr-initialization.patch
#rhbz 963991
ApplyPatch acpi-pcie-hotplug-conflict.patch
#rhbz1002351
ApplyPatch crypto-fix-race-in-larval-lookup.patch
# END OF PATCH APPLICATIONS
%endif
@ -2258,6 +2264,7 @@ fi
%changelog
* Wed Sep 11 2013 Neil Horman <nhorman@redhat.com>
- Fix pcie/acpi hotplug conflict (rhbz 963991)
- Fix race in crypto larval lookup
* Wed Sep 11 2013 Justin M. Forbes <jforbes@fedoraproject.org>
- Linux v3.11 rebase