Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8edb3cb authored by Chuck Ebbert's avatar Chuck Ebbert Committed by Herbert Xu
Browse files

crypto: padlock-aes - Use the correct mask when checking whether copying is required 



Masking with PAGE_SIZE is just wrong...

Signed-off-by: default avatarChuck Ebbert <cebbert@redhat.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 13b79b97

drivers/crypto/padlock-aes.c

+2 −2
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static inline void ecb_crypt(const u8 *in, u8 *out, u32 *key, 
	/* Padlock in ECB mode fetches at least ecb_fetch_bytes of data.

	 * We could avoid some copying here but it's probably not worth it.

	 */

	if (unlikely(((unsigned long)in & PAGE_SIZE) + ecb_fetch_bytes > PAGE_SIZE)) {

	if (unlikely(((unsigned long)in & ~PAGE_MASK) + ecb_fetch_bytes > PAGE_SIZE)) {

		ecb_crypt_copy(in, out, key, cword, count);

		return;

	}
@@ -248,7 +248,7 @@ static inline u8 *cbc_crypt(const u8 *in, u8 *out, u32 *key, 
			    u8 *iv, struct cword *cword, int count)

{

	/* Padlock in CBC mode fetches at least cbc_fetch_bytes of data. */

	if (unlikely(((unsigned long)in & PAGE_SIZE) + cbc_fetch_bytes > PAGE_SIZE))

	if (unlikely(((unsigned long)in & ~PAGE_MASK) + cbc_fetch_bytes > PAGE_SIZE))

		return cbc_crypt_copy(in, out, key, iv, cword, count);



	return rep_xcrypt_cbc(in, out, key, iv, cword, count);