Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / ceph / osdmap.c

diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index d73f3f6efa36ff6cf9efc33cada1853afa8073e7..71603ac3dff54486cf1cdacaea142a3ecfc5f6fc 100644 (file)
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -605,8 +605,10 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end)
                        goto bad;
                }
                err = __decode_pool(p, end, pi);
-               if (err < 0)
+               if (err < 0) {
+                       kfree(pi);
                        goto bad;
+               }
                __insert_pg_pool(&map->pg_pools, pi);
        }