Skip to content

Commit f5f2c9a

Browse files
committed
libceph: align session_key and con_secret to 16 bytes
crypto_shash_setkey() and crypto_aead_setkey() will do a (small) GFP_ATOMIC allocation to align the key if it isn't suitably aligned. It's not a big deal, but at the same time easy to avoid. The actual alignment requirement is dynamic, queryable with crypto_shash_alignmask() and crypto_aead_alignmask(), but shouldn't be stricter than 16 bytes for our algorithms. Fixes: cd1a677 ("libceph, ceph: implement msgr2.1 protocol (crc and secure modes)") Signed-off-by: Ilya Dryomov <[email protected]>
1 parent ad32fe8 commit f5f2c9a

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

net/ceph/messenger_v2.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2033,10 +2033,18 @@ static int process_auth_reply_more(struct ceph_connection *con,
20332033
return -EINVAL;
20342034
}
20352035

2036+
/*
2037+
* Align session_key and con_secret to avoid GFP_ATOMIC allocation
2038+
* inside crypto_shash_setkey() and crypto_aead_setkey() called from
2039+
* setup_crypto(). __aligned(16) isn't guaranteed to work for stack
2040+
* objects, so do it by hand.
2041+
*/
20362042
static int process_auth_done(struct ceph_connection *con, void *p, void *end)
20372043
{
2038-
u8 session_key[CEPH_KEY_LEN];
2039-
u8 con_secret[CEPH_MAX_CON_SECRET_LEN];
2044+
u8 session_key_buf[CEPH_KEY_LEN + 16];
2045+
u8 con_secret_buf[CEPH_MAX_CON_SECRET_LEN + 16];
2046+
u8 *session_key = PTR_ALIGN(&session_key_buf[0], 16);
2047+
u8 *con_secret = PTR_ALIGN(&con_secret_buf[0], 16);
20402048
int session_key_len, con_secret_len;
20412049
int payload_len;
20422050
u64 global_id;

0 commit comments

Comments
 (0)