Applied to ceph tree; thanks! On Tue, 28 May 2013, Emil Goode wrote: > 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 <emilgoode@xxxxxxxxx> > --- > fs/ceph/mdsmap.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c > index 9278dec..d4d3897 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) > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe ceph-devel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
