diff options
| author | Noah Watkins <noahwatkins@gmail.com> | 2011-09-12 14:51:58 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-10-25 16:10:16 -0700 |
| commit | 49d9224c047f23089c49a6749609447abd09ee03 (patch) | |
| tree | 4e0b057f29b006f8143a5350baf6e056f9c75faf /net | |
| parent | a35eca958aa1c7d0b5f993db1a3ded45ae16d59b (diff) | |
| download | linux-3.10-49d9224c047f23089c49a6749609447abd09ee03.tar.gz linux-3.10-49d9224c047f23089c49a6749609447abd09ee03.tar.bz2 linux-3.10-49d9224c047f23089c49a6749609447abd09ee03.zip | |
ceph: fix ceph_monc_init memory leak
failure clean up does not consider ceph_auth_init.
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/mon_client.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index af2ef308249..0b62deae42b 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -759,8 +759,10 @@ int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl) /* authentication */ monc->auth = ceph_auth_init(cl->options->name, cl->options->key); - if (IS_ERR(monc->auth)) - return PTR_ERR(monc->auth); + if (IS_ERR(monc->auth)) { + err = PTR_ERR(monc->auth); + goto out_con; + } monc->auth->want_keys = CEPH_ENTITY_TYPE_AUTH | CEPH_ENTITY_TYPE_MON | CEPH_ENTITY_TYPE_OSD | CEPH_ENTITY_TYPE_MDS; @@ -771,7 +773,7 @@ int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl) sizeof(struct ceph_mon_subscribe_ack), GFP_NOFS, true); if (!monc->m_subscribe_ack) - goto out_con; + goto out_auth; monc->m_subscribe = ceph_msg_new(CEPH_MSG_MON_SUBSCRIBE, 96, GFP_NOFS, true); @@ -809,6 +811,8 @@ out_subscribe: ceph_msg_put(monc->m_subscribe); out_subscribe_ack: ceph_msg_put(monc->m_subscribe_ack); +out_auth: + ceph_auth_destroy(monc->auth); out_con: monc->con->ops->put(monc->con); out_monmap: |