1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index 0c08c58252be..5158a9db4bc5 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -284,7 +284,11 @@ aes_hw_extkey_available(uint8_t key_len)
 
 static inline struct aes_ctx *aes_ctx(void *ctx)
 {
-        return (struct aes_ctx *)ALIGN((unsigned long)ctx, PADLOCK_ALIGNMENT);
+        unsigned long align = PADLOCK_ALIGNMENT;
+
+        if (align <= crypto_tfm_ctx_alignment())
+                align = 1;
+        return (struct aes_ctx *)ALIGN((unsigned long)ctx, align);
 }
 
 static int