aboutsummaryrefslogtreecommitdiff
path: root/fs/ceph
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-03-15 15:57:04 -0700
committerSage Weil <sage@newdream.net>2010-03-20 21:33:11 -0700
commit5b3dbb44ab40660a080d03585bd35f45b2890c49 (patch)
tree4303e51cf6922c92ea8a60217f5694d83de06a3a /fs/ceph
parent807c86e2ceba8febe79b289d50cd0d5e0b0af917 (diff)
ceph: release old ticket_blob buffer
Release the old ticket_blob buffer when we get an updated service ticket from the monitor. Previously these were getting leaked. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/auth_x.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ceph/auth_x.c b/fs/ceph/auth_x.c
index 96e7aaa7767..33d3ad4dc45 100644
--- a/fs/ceph/auth_x.c
+++ b/fs/ceph/auth_x.c
@@ -156,6 +156,7 @@ static int ceph_x_proc_ticket_reply(struct ceph_auth_client *ac,
struct timespec validity;
struct ceph_crypto_key old_key;
void *tp, *tpend;
+ struct ceph_buffer *new_ticket_blob;
ceph_decode_need(&p, end, sizeof(u32) + 1, bad);
@@ -223,9 +224,12 @@ static int ceph_x_proc_ticket_reply(struct ceph_auth_client *ac,
ceph_decode_need(&tp, tpend, 1 + sizeof(u64), bad);
struct_v = ceph_decode_8(&tp);
th->secret_id = ceph_decode_64(&tp);
- ret = ceph_decode_buffer(&th->ticket_blob, &tp, tpend);
+ ret = ceph_decode_buffer(&new_ticket_blob, &tp, tpend);
if (ret)
goto out;
+ if (th->ticket_blob)
+ ceph_buffer_put(th->ticket_blob);
+ th->ticket_blob = new_ticket_blob;
dout(" got ticket service %d (%s) secret_id %lld len %d\n",
type, ceph_entity_type_name(type), th->secret_id,
(int)th->ticket_blob->vec.iov_len);