crypto: skcipher - Make skcipher_walk src.virt.addr const

Mark the src.virt.addr field in struct skcipher_walk as a pointer
to const data.  This guarantees that the user won't modify the data
which should be done through dst.virt.addr to ensure that flushing
is done when necessary.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c
index 21df5e7f51f9c96ef66c271c31cc5d1bd9192923..1cf61f51e7665738591216c0866ecede030ed2a0 100644 (file)
--- a/arch/arm/crypto/aes-ce-glue.c
+++ b/arch/arm/crypto/aes-ce-glue.c
@@ -399,9 +399,9 @@ static int ctr_encrypt(struct skcipher_request *req)
        }
        if (walk.nbytes) {
                u8 __aligned(8) tail[AES_BLOCK_SIZE];
+               const u8 *tsrc = walk.src.virt.addr;
                unsigned int nbytes = walk.nbytes;
                u8 *tdst = walk.dst.virt.addr;
-               u8 *tsrc = walk.src.virt.addr;
 
                /*
                 * Tell aes_ctr_encrypt() to process a tail block.

diff --git a/arch/arm64/crypto/aes-neonbs-glue.c b/arch/arm64/crypto/aes-neonbs-glue.c
index 46425e7b9755e08338af49e4f5e175e35920450c..c4a623e865934b02232c5e23a6c6de91c2c00fb3 100644 (file)
--- a/arch/arm64/crypto/aes-neonbs-glue.c
+++ b/arch/arm64/crypto/aes-neonbs-glue.c
@@ -287,7 +287,8 @@ static int __xts_crypt(struct skcipher_request *req, bool encrypt,
        struct skcipher_walk walk;
        int nbytes, err;
        int first = 1;
-       u8 *out, *in;
+       const u8 *in;
+       u8 *out;
 
        if (req->cryptlen < AES_BLOCK_SIZE)
                return -EINVAL;

diff --git a/arch/powerpc/crypto/aes-gcm-p10-glue.c b/arch/powerpc/crypto/aes-gcm-p10-glue.c
index 679f52794baffa8f22ff46a9e03775fb6462f1a8..85f4fd4b1bdc5d9073bbd52d02a76c1c4359a71d 100644 (file)
--- a/arch/powerpc/crypto/aes-gcm-p10-glue.c
+++ b/arch/powerpc/crypto/aes-gcm-p10-glue.c
@@ -35,9 +35,9 @@ MODULE_ALIAS_CRYPTO("aes");
 asmlinkage int aes_p10_set_encrypt_key(const u8 *userKey, const int bits,
                                       void *key);
 asmlinkage void aes_p10_encrypt(const u8 *in, u8 *out, const void *key);
-asmlinkage void aes_p10_gcm_encrypt(u8 *in, u8 *out, size_t len,
+asmlinkage void aes_p10_gcm_encrypt(const u8 *in, u8 *out, size_t len,
                                    void *rkey, u8 *iv, void *Xi);
-asmlinkage void aes_p10_gcm_decrypt(u8 *in, u8 *out, size_t len,
+asmlinkage void aes_p10_gcm_decrypt(const u8 *in, u8 *out, size_t len,
                                    void *rkey, u8 *iv, void *Xi);
 asmlinkage void gcm_init_htable(unsigned char htable[], unsigned char Xi[]);
 asmlinkage void gcm_ghash_p10(unsigned char *Xi, unsigned char *Htable,
@@ -261,7 +261,7 @@ static int p10_aes_gcm_crypt(struct aead_request *req, u8 *riv,
                return ret;
 
        while ((nbytes = walk.nbytes) > 0 && ret == 0) {
-               u8 *src = walk.src.virt.addr;
+               const u8 *src = walk.src.virt.addr;
                u8 *dst = walk.dst.virt.addr;
                u8 buf[AES_BLOCK_SIZE];
 

diff --git a/arch/powerpc/crypto/aes_ctr.c b/arch/powerpc/crypto/aes_ctr.c
index 9a3da8cd62f3595efd747e5b4743b1b8dfb4a747..3da75f42529a534b50a760133338eb9ffa396d5d 100644 (file)
--- a/arch/powerpc/crypto/aes_ctr.c
+++ b/arch/powerpc/crypto/aes_ctr.c
@@ -69,9 +69,9 @@ static int p8_aes_ctr_setkey(struct crypto_skcipher *tfm, const u8 *key,
 static void p8_aes_ctr_final(const struct p8_aes_ctr_ctx *ctx,
                             struct skcipher_walk *walk)
 {
+       const u8 *src = walk->src.virt.addr;
        u8 *ctrblk = walk->iv;
        u8 keystream[AES_BLOCK_SIZE];
-       u8 *src = walk->src.virt.addr;
        u8 *dst = walk->dst.virt.addr;
        unsigned int nbytes = walk->nbytes;
 

diff --git a/arch/sparc/crypto/aes_glue.c b/arch/sparc/crypto/aes_glue.c
index e3d2138ff9e294014d1e175297a1c6b5d8977fb5..6831508303562ecca79ad60375572ae1b7357a54 100644 (file)
--- a/arch/sparc/crypto/aes_glue.c
+++ b/arch/sparc/crypto/aes_glue.c
@@ -321,7 +321,7 @@ static void ctr_crypt_final(const struct crypto_sparc64_aes_ctx *ctx,
 {
        u8 *ctrblk = walk->iv;
        u64 keystream[AES_BLOCK_SIZE / sizeof(u64)];
-       u8 *src = walk->src.virt.addr;
+       const u8 *src = walk->src.virt.addr;
        u8 *dst = walk->dst.virt.addr;
        unsigned int nbytes = walk->nbytes;
 

diff --git a/arch/x86/crypto/des3_ede_glue.c b/arch/x86/crypto/des3_ede_glue.c
index e88439d3828ea23034618ae36739667dd920416c..34600f90d8a6fc6e61912efa2786a91436965052 100644 (file)
--- a/arch/x86/crypto/des3_ede_glue.c
+++ b/arch/x86/crypto/des3_ede_glue.c
@@ -73,7 +73,7 @@ static int ecb_crypt(struct skcipher_request *req, const u32 *expkey)
        err = skcipher_walk_virt(&walk, req, false);
 
        while ((nbytes = walk.nbytes)) {
-               u8 *wsrc = walk.src.virt.addr;
+               const u8 *wsrc = walk.src.virt.addr;
                u8 *wdst = walk.dst.virt.addr;
 
                /* Process four block batch */

diff --git a/crypto/ctr.c b/crypto/ctr.c
index 73c0d6e53b2fd0e54061065dfcede824a93b40ad..97a947b0a8761730afc988244f991dd8de39478e 100644 (file)
--- a/crypto/ctr.c
+++ b/crypto/ctr.c
@@ -33,7 +33,7 @@ static void crypto_ctr_crypt_final(struct skcipher_walk *walk,
        u8 *ctrblk = walk->iv;
        u8 tmp[MAX_CIPHER_BLOCKSIZE + MAX_CIPHER_ALIGNMASK];
        u8 *keystream = PTR_ALIGN(tmp + 0, alignmask + 1);
-       u8 *src = walk->src.virt.addr;
+       const u8 *src = walk->src.virt.addr;
        u8 *dst = walk->dst.virt.addr;
        unsigned int nbytes = walk->nbytes;
 
@@ -50,7 +50,7 @@ static int crypto_ctr_crypt_segment(struct skcipher_walk *walk,
                   crypto_cipher_alg(tfm)->cia_encrypt;
        unsigned int bsize = crypto_cipher_blocksize(tfm);
        u8 *ctrblk = walk->iv;
-       u8 *src = walk->src.virt.addr;
+       const u8 *src = walk->src.virt.addr;
        u8 *dst = walk->dst.virt.addr;
        unsigned int nbytes = walk->nbytes;
 
@@ -77,20 +77,20 @@ static int crypto_ctr_crypt_inplace(struct skcipher_walk *walk,
        unsigned int bsize = crypto_cipher_blocksize(tfm);
        unsigned long alignmask = crypto_cipher_alignmask(tfm);
        unsigned int nbytes = walk->nbytes;
+       u8 *dst = walk->dst.virt.addr;
        u8 *ctrblk = walk->iv;
-       u8 *src = walk->src.virt.addr;
        u8 tmp[MAX_CIPHER_BLOCKSIZE + MAX_CIPHER_ALIGNMASK];
        u8 *keystream = PTR_ALIGN(tmp + 0, alignmask + 1);
 
        do {
                /* create keystream */
                fn(crypto_cipher_tfm(tfm), keystream, ctrblk);
-               crypto_xor(src, keystream, bsize);
+               crypto_xor(dst, keystream, bsize);
 
                /* increment counter in counterblock */
                crypto_inc(ctrblk, bsize);
 
-               src += bsize;
+               dst += bsize;
        } while ((nbytes -= bsize) >= bsize);
 
        return nbytes;

diff --git a/crypto/lrw.c b/crypto/lrw.c
index e216fbf2b7866758f35d42c69ec3fb4c6e2ba86d..391ae0f7641ff90ffe4ac29fc25f836b716e2a32 100644 (file)
--- a/crypto/lrw.c
+++ b/crypto/lrw.c
@@ -167,7 +167,7 @@ static int lrw_xor_tweak(struct skcipher_request *req, bool second_pass)
 
        while (w.nbytes) {
                unsigned int avail = w.nbytes;
-               be128 *wsrc;
+               const be128 *wsrc;
                be128 *wdst;
 
                wsrc = w.src.virt.addr;

diff --git a/crypto/pcbc.c b/crypto/pcbc.c
index cbfb3ac14b3a8084a21a91e73a8765e47b1b5469..9d2e56d6744a99dde37fba7446a95ee9082d4b08 100644 (file)
--- a/crypto/pcbc.c
+++ b/crypto/pcbc.c
@@ -22,8 +22,8 @@ static int crypto_pcbc_encrypt_segment(struct skcipher_request *req,
                                       struct crypto_cipher *tfm)
 {
        int bsize = crypto_cipher_blocksize(tfm);
+       const u8 *src = walk->src.virt.addr;
        unsigned int nbytes = walk->nbytes;
-       u8 *src = walk->src.virt.addr;
        u8 *dst = walk->dst.virt.addr;
        u8 * const iv = walk->iv;
 
@@ -45,17 +45,17 @@ static int crypto_pcbc_encrypt_inplace(struct skcipher_request *req,
 {
        int bsize = crypto_cipher_blocksize(tfm);
        unsigned int nbytes = walk->nbytes;
-       u8 *src = walk->src.virt.addr;
+       u8 *dst = walk->dst.virt.addr;
        u8 * const iv = walk->iv;
        u8 tmpbuf[MAX_CIPHER_BLOCKSIZE];
 
        do {
-               memcpy(tmpbuf, src, bsize);
-               crypto_xor(iv, src, bsize);
-               crypto_cipher_encrypt_one(tfm, src, iv);
-               crypto_xor_cpy(iv, tmpbuf, src, bsize);
+               memcpy(tmpbuf, dst, bsize);
+               crypto_xor(iv, dst, bsize);
+               crypto_cipher_encrypt_one(tfm, dst, iv);
+               crypto_xor_cpy(iv, tmpbuf, dst, bsize);
 
-               src += bsize;
+               dst += bsize;
        } while ((nbytes -= bsize) >= bsize);
 
        return nbytes;
@@ -89,8 +89,8 @@ static int crypto_pcbc_decrypt_segment(struct skcipher_request *req,
                                       struct crypto_cipher *tfm)
 {
        int bsize = crypto_cipher_blocksize(tfm);
+       const u8 *src = walk->src.virt.addr;
        unsigned int nbytes = walk->nbytes;
-       u8 *src = walk->src.virt.addr;
        u8 *dst = walk->dst.virt.addr;
        u8 * const iv = walk->iv;
 
@@ -112,17 +112,17 @@ static int crypto_pcbc_decrypt_inplace(struct skcipher_request *req,
 {
        int bsize = crypto_cipher_blocksize(tfm);
        unsigned int nbytes = walk->nbytes;
-       u8 *src = walk->src.virt.addr;
+       u8 *dst = walk->dst.virt.addr;
        u8 * const iv = walk->iv;
        u8 tmpbuf[MAX_CIPHER_BLOCKSIZE] __aligned(__alignof__(u32));
 
        do {
-               memcpy(tmpbuf, src, bsize);
-               crypto_cipher_decrypt_one(tfm, src, src);
-               crypto_xor(src, iv, bsize);
-               crypto_xor_cpy(iv, src, tmpbuf, bsize);
+               memcpy(tmpbuf, dst, bsize);
+               crypto_cipher_decrypt_one(tfm, dst, dst);
+               crypto_xor(dst, iv, bsize);
+               crypto_xor_cpy(iv, dst, tmpbuf, bsize);
 
-               src += bsize;
+               dst += bsize;
        } while ((nbytes -= bsize) >= bsize);
 
        return nbytes;

diff --git a/crypto/xctr.c b/crypto/xctr.c
index 6ed9c85ededa0901bf29c068437bf49d8b626abb..9c536ab6d2e5958d31288513880f96c489591b3b 100644 (file)
--- a/crypto/xctr.c
+++ b/crypto/xctr.c
@@ -78,7 +78,7 @@ static int crypto_xctr_crypt_inplace(struct skcipher_walk *walk,
                   crypto_cipher_alg(tfm)->cia_encrypt;
        unsigned long alignmask = crypto_cipher_alignmask(tfm);
        unsigned int nbytes = walk->nbytes;
-       u8 *data = walk->src.virt.addr;
+       u8 *data = walk->dst.virt.addr;
        u8 tmp[XCTR_BLOCKSIZE + MAX_CIPHER_ALIGNMASK];
        u8 *keystream = PTR_ALIGN(tmp + 0, alignmask + 1);
        __le32 ctr32 = cpu_to_le32(byte_ctr / XCTR_BLOCKSIZE + 1);

diff --git a/crypto/xts.c b/crypto/xts.c
index 821060ede2cf001c62c471861019768d2c803dd9..31529c9ef08f8f16c4c7a0d0b38203dad5296748 100644 (file)
--- a/crypto/xts.c
+++ b/crypto/xts.c
@@ -99,7 +99,7 @@ static int xts_xor_tweak(struct skcipher_request *req, bool second_pass,
 
        while (w.nbytes) {
                unsigned int avail = w.nbytes;
-               le128 *wsrc;
+               const le128 *wsrc;
                le128 *wdst;
 
                wsrc = w.src.virt.addr;

diff --git a/include/crypto/ctr.h b/include/crypto/ctr.h
index a1c66d1001af925ce2bccff646e37672adf9dc9f..da1ee73e9ce90a87fca5e990d0e95d89ce3ba6f9 100644 (file)
--- a/include/crypto/ctr.h
+++ b/include/crypto/ctr.h
@@ -34,8 +34,8 @@ static inline int crypto_ctr_encrypt_walk(struct skcipher_request *req,
        err = skcipher_walk_virt(&walk, req, false);
 
        while (walk.nbytes > 0) {
+               const u8 *src = walk.src.virt.addr;
                u8 *dst = walk.dst.virt.addr;
-               u8 *src = walk.src.virt.addr;
                int nbytes = walk.nbytes;
                int tail = 0;
 

diff --git a/include/crypto/internal/skcipher.h b/include/crypto/internal/skcipher.h
index c705124432c58066420fd01d1f79ce7acca9ac4e..a958ab0636ad067e4332b61303a679c8a3b7f90b 100644 (file)
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
@@ -59,7 +59,7 @@ struct skcipher_walk {
                /* Virtual address of the source. */
                struct {
                        struct {
-                               void *const addr;
+                               const void *const addr;
                        } virt;
                } src;