crypto: keywrap - memzero the correct memory
authorDan Carpenter <dan.carpenter@oracle.com>
Sat, 30 Jan 2016 14:38:28 +0000 (17:38 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Apr 2016 16:08:45 +0000 (09:08 -0700)
commit 2b8b28fd232233c22fb61009dd8b0587390d2875 upstream.

We're clearing the wrong memory.  The memory corruption is likely
harmless because we weren't going to use that stack memory again but not
zeroing is a potential information leak.

Fixes: e28facde3c39 ('crypto: keywrap - add key wrapping block chaining mode')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
crypto/keywrap.c

index b1d106ce55f3d9c98bba9a54f301d4d94f12d982..72014f963ba7a65cbb3dd856a63f25ab647c3209 100644 (file)
@@ -212,7 +212,7 @@ static int crypto_kw_decrypt(struct blkcipher_desc *desc,
                          SEMIBSIZE))
                ret = -EBADMSG;
 
-       memzero_explicit(&block, sizeof(struct crypto_kw_block));
+       memzero_explicit(block, sizeof(struct crypto_kw_block));
 
        return ret;
 }
@@ -297,7 +297,7 @@ static int crypto_kw_encrypt(struct blkcipher_desc *desc,
        /* establish the IV for the caller to pick up */
        memcpy(desc->info, block->A, SEMIBSIZE);
 
-       memzero_explicit(&block, sizeof(struct crypto_kw_block));
+       memzero_explicit(block, sizeof(struct crypto_kw_block));
 
        return 0;
 }