From cf2ee904cb7f87621835a1628747ffa000521689 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 30 Jan 2013 10:06:02 +0300 Subject: [PATCH] --- yaml --- r: 360218 b: refs/heads/master c: 6d1f6621fa12800fc84f62db9e0b7a6b623eb439 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/osd/osd_initiator.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 037dfae6627c..ef610824a5a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50e9291578886099888b8169459c6f97626ccbfc +refs/heads/master: 6d1f6621fa12800fc84f62db9e0b7a6b623eb439 diff --git a/trunk/drivers/scsi/osd/osd_initiator.c b/trunk/drivers/scsi/osd/osd_initiator.c index c06b8e5aa2cf..d8293f25ca33 100644 --- a/trunk/drivers/scsi/osd/osd_initiator.c +++ b/trunk/drivers/scsi/osd/osd_initiator.c @@ -144,6 +144,10 @@ static int _osd_get_print_system_info(struct osd_dev *od, odi->osdname_len = get_attrs[a].len; /* Avoid NULL for memcmp optimization 0-length is good enough */ odi->osdname = kzalloc(odi->osdname_len + 1, GFP_KERNEL); + if (!odi->osdname) { + ret = -ENOMEM; + goto out; + } if (odi->osdname_len) memcpy(odi->osdname, get_attrs[a].val_ptr, odi->osdname_len); OSD_INFO("OSD_NAME [%s]\n", odi->osdname);