diff options
| author |   Ilya Dryomov <idryomov@gmail.com> | 2017-05-19 14:24:36 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2017-05-23 20:32:28 +0200 |
| commit | b51456a6096ebf9f4ceb2cc7e176b471d4b70af0 (patch) | |
| tree | 5f955c4b414044d4cfc1fc6a553e6844049f052b /net/ceph | |
| parent | libceph: validate blob_struct_v in process_one_ticket() (diff) | |
| download | linux-dev-b51456a6096ebf9f4ceb2cc7e176b471d4b70af0.tar.xz linux-dev-b51456a6096ebf9f4ceb2cc7e176b471d4b70af0.zip | |
libceph: fix error handling in process_one_ticket()
Don't leak key internals after new_session_key is populated.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/auth_x.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c index d0126df33f1f..8757fb87dab8 100644 --- a/net/ceph/auth_x.c +++ b/net/ceph/auth_x.c @@ -151,7 +151,7 @@ static int process_one_ticket(struct ceph_auth_client *ac, struct timespec validity; void *tp, *tpend; void **ptp; - struct ceph_crypto_key new_session_key; + struct ceph_crypto_key new_session_key = { 0 }; struct ceph_buffer *new_ticket_blob; unsigned long new_expires, new_renew_after; u64 new_secret_id; @@ -237,13 +237,13 @@ static int process_one_ticket(struct ceph_auth_client *ac, type, ceph_entity_type_name(type), th->secret_id, (int)th->ticket_blob->vec.iov_len); xi->have_keys |= th->service; - -out: - return ret; + return 0; bad: ret = -EINVAL; - goto out; +out: + ceph_crypto_key_destroy(&new_session_key); + return ret; } static int ceph_x_proc_ticket_reply(struct ceph_auth_client *ac, |