raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

libceph: rename and align ceph_x_authorizer::reply_buf

Browse Source 
commit 7882a26d2e upstream.

It's going to be used as a temporary buffer for in-place en/decryption
with ceph_crypt() instead of on-stack buffers, so rename to enc_buf.
Ensure alignment to avoid GFP_ATOMIC allocations in the crypto stack.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ilya Dryomov
2016-12-02 16:35:07 +01:00
committed by Greg Kroah-Hartman
parent ecf7ced856
commit 788a0bbc70
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/ceph/auth_x.c
View File

@@ -603,8 +603,8 @@ static int ceph_x_create_authorizer(
auth->authorizer = (struct ceph_authorizer *) au; auth->authorizer = (struct ceph_authorizer *) au;
auth->authorizer_buf = au->buf->vec.iov_base; auth->authorizer_buf = au->buf->vec.iov_base;
auth->authorizer_buf_len = au->buf->vec.iov_len; auth->authorizer_buf_len = au->buf->vec.iov_len;
auth->authorizer_reply_buf = au->reply_buf; auth->authorizer_reply_buf = au->enc_buf;
auth->authorizer_reply_buf_len = sizeof (au->reply_buf); auth->authorizer_reply_buf_len = CEPHX_AU_ENC_BUF_LEN;
auth->sign_message = ac->ops->sign_message; auth->sign_message = ac->ops->sign_message;
auth->check_message_signature = ac->ops->check_message_signature; auth->check_message_signature = ac->ops->check_message_signature;
@@ -638,10 +638,10 @@ static int ceph_x_verify_authorizer_reply(struct ceph_auth_client *ac,
int ret = 0; int ret = 0;
struct ceph_x_authorize_reply reply; struct ceph_x_authorize_reply reply;
void *preply = &reply; void *preply = &reply;
void *p = au->reply_buf; void *p = au->enc_buf;
void *end = p + sizeof(au->reply_buf);
ret = ceph_x_decrypt(&au->session_key, &p, end, &preply, sizeof(reply)); ret = ceph_x_decrypt(&au->session_key, &p, p + CEPHX_AU_ENC_BUF_LEN,
&preply, sizeof(reply));
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret != sizeof(reply)) if (ret != sizeof(reply))

3
net/ceph/auth_x.h
View File

@@ -24,6 +24,7 @@ struct ceph_x_ticket_handler {
unsigned long renew_after, expires; unsigned long renew_after, expires;
}; };
#define CEPHX_AU_ENC_BUF_LEN 128 /* big enough for encrypted blob */
struct ceph_x_authorizer { struct ceph_x_authorizer {
struct ceph_authorizer base; struct ceph_authorizer base;
@@ -32,7 +33,7 @@ struct ceph_x_authorizer {
unsigned int service; unsigned int service;
u64 nonce; u64 nonce;
u64 secret_id; u64 secret_id;
char reply_buf[128]; /* big enough for encrypted blob */ char enc_buf[CEPHX_AU_ENC_BUF_LEN] __aligned(8);
}; };
struct ceph_x_info { struct ceph_x_info {