From: Emil Goode Date: Tue, 28 May 2013 14:59:00 +0000 (+0200) Subject: ceph: improve error handling in ceph_mdsmap_decode X-Git-Tag: firefly_0821_release~3679^2~3164 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f1b6559cfa8c280249b52112223459b00dcdb6e9;p=firefly-linux-kernel-4.4.55.git ceph: improve error handling in ceph_mdsmap_decode commit c213b50b7dcbf06abcfbf1e4eee5b76586718bd9 upstream. This patch makes the following improvements to the error handling in the ceph_mdsmap_decode function: - Add a NULL check for return value from kcalloc - Make use of the variable err Signed-off-by: Emil Goode Signed-off-by: Sage Weil Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c index 9278dec9e940..d4d38977dcbb 100644 --- a/fs/ceph/mdsmap.c +++ b/fs/ceph/mdsmap.c @@ -138,6 +138,8 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) m->m_info[mds].export_targets = kcalloc(num_export_targets, sizeof(u32), GFP_NOFS); + if (m->m_info[mds].export_targets == NULL) + goto badmem; for (j = 0; j < num_export_targets; j++) m->m_info[mds].export_targets[j] = ceph_decode_32(&pexport_targets); @@ -170,7 +172,7 @@ bad: DUMP_PREFIX_OFFSET, 16, 1, start, end - start, true); ceph_mdsmap_destroy(m); - return ERR_PTR(-EINVAL); + return ERR_PTR(err); } void ceph_mdsmap_destroy(struct ceph_mdsmap *m)