[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <51ADB484.3060404@huawei.com>
Date:	Tue, 4 Jun 2013 17:33:56 +0800
From:	Libo Chen <libo.chen@...wei.com>
To:	<megaraidlinux@....com>, <JBottomley@...allels.com>
CC:	Libo Chen <chenlibo.3@...il.com>, <linux-scsi@...r.kernel.org>,
	LKML <linux-kernel@...r.kernel.org>, <kashyap.desai@....com>,
	<aradford@...il.com>, Li Zefan <lizefan@...wei.com>,
	Santosh Y <santoshsy@...il.com>,
	Tomas Henzl <thenzl@...hat.com>
Subject: Re: [PATCH v2] scsi: megaraid: check kzalloc
we should check kzalloc, avoid to hit oops
Change from v1:
- put kzalloc outside of mutex
Signed-off-by: Libo Chen <libo.chen@...wei.com>
---
 drivers/scsi/megaraid.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 846f475..cc599cc 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -4150,6 +4150,12 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)
 	if (!scmd)
 		return -ENOMEM;
+	sdev = kzalloc(sizeof(struct scsi_device), GFP_KERNEL);
+	if (!sdev) {
+		scsi_free_command(GFP_KERNEL, scmd);
+		return -ENOMEM;
+	}
+
 	/*
 	 * The internal commands share one command id and hence are
 	 * serialized. This is so because we want to reserve maximum number of
@@ -4160,7 +4166,6 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)
 	scb = &adapter->int_scb;
 	memset(scb, 0, sizeof(scb_t));
-	sdev = kzalloc(sizeof(struct scsi_device), GFP_KERNEL);
 	scmd->device = sdev;
 	memset(adapter->int_cdb, 0, sizeof(adapter->int_cdb));
-- 
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Powered by blists - more mailing lists
 
