Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] padlock: Fix alignment after aes_ctx rearrange
+7
-2
drivers/crypto/padlock-aes.c
+7
-2
drivers/crypto/padlock-aes.c
···
59
59
#define AES_EXTENDED_KEY_SIZE 64 /* in uint32_t units */
60
60
#define AES_EXTENDED_KEY_SIZE_B (AES_EXTENDED_KEY_SIZE * sizeof(uint32_t))
61
61
62
+
/* Whenever making any changes to the following
63
+
* structure *make sure* you keep E, d_data
64
+
* and cword aligned on 16 Bytes boundaries!!! */
62
65
struct aes_ctx {
63
66
struct {
64
67
struct cword encrypt;
···
69
66
} cword;
70
67
u32 *D;
71
68
int key_length;
72
-
u32 E[AES_EXTENDED_KEY_SIZE];
73
-
u32 d_data[AES_EXTENDED_KEY_SIZE];
69
+
u32 E[AES_EXTENDED_KEY_SIZE]
70
+
__attribute__ ((__aligned__(PADLOCK_ALIGNMENT)));
71
+
u32 d_data[AES_EXTENDED_KEY_SIZE]
72
+
__attribute__ ((__aligned__(PADLOCK_ALIGNMENT)));
74
73
};
75
74
76
75
/* ====== Key management routines ====== */