rpms/kernel/F-10 linux-2.6-crypto-aes-padlock-fix-autoload-2.patch, NONE, 1.1 kernel.spec, 1.1345, 1.1346

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5231

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-crypto-aes-padlock-fix-autoload-2.patch 
Log Message:
Add missed patch for fixing VIA Padlock driver autoload.

linux-2.6-crypto-aes-padlock-fix-autoload-2.patch:

--- NEW FILE linux-2.6-crypto-aes-padlock-fix-autoload-2.patch ---
commit 37fc334cc8eb84f5fe0a5a1cbe6a6a68049e142a
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date:   Tue Apr 21 13:27:16 2009 +0800

    crypto: api - Fix algorithm module auto-loading
    
    The commit a760a6656e6f00bb0144a42a048cf0266646e22c (crypto:
    api - Fix module load deadlock with fallback algorithms) broke
    the auto-loading of algorithms that require fallbacks.  The
    problem is that the fallback mask check is missing an and which
    cauess bits that should be considered to interfere with the
    result.
    
    Reported-by: Chuck Ebbert <cebbert at redhat.com>
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

diff --git a/crypto/api.c b/crypto/api.c
index 314dab9..fd2545d 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -221,7 +221,8 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)
 
 		request_module(name);
 
-		if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask) &&
+		if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask &
+		      CRYPTO_ALG_NEED_FALLBACK) &&
 		    snprintf(tmp, sizeof(tmp), "%s-all", name) < sizeof(tmp))
 			request_module(tmp);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1345
retrieving revision 1.1346
diff -u -r1.1345 -r1.1346
--- kernel.spec	23 Apr 2009 17:49:58 -0000	1.1345
+++ kernel.spec	23 Apr 2009 21:09:17 -0000	1.1346
@@ -714,6 +714,7 @@
 Patch9304: linux-2.6-xen-check-for-nx-support.patch
 
 Patch9400: linux-2.6-crypto-aes-padlock-fix-autoload.patch
+Patch9401: linux-2.6-crypto-aes-padlock-fix-autoload-2.patch
 
 # Backport of upstream memory reduction for ftrace
 Patch10000: linux-2.6-ftrace-memory-reduction.patch
@@ -1329,6 +1330,7 @@
 
 # make padlock autoload again
 ApplyPatch linux-2.6-crypto-aes-padlock-fix-autoload.patch
+ApplyPatch linux-2.6-crypto-aes-padlock-fix-autoload-2.patch
 
 # Reduce the memory usage of ftrace if you don't use it.
 ApplyPatch linux-2.6-ftrace-memory-reduction.patch
@@ -1909,6 +1911,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-46.rc1
+- Add missed patch for fixing VIA Padlock driver autoload.
+
 * Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-45.rc1
 - drm-backport-f11-fixes-1.patch