Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030516Ab3E3KzL (ORCPT ); Thu, 30 May 2013 06:55:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40584 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968083Ab3E3KzE (ORCPT ); Thu, 30 May 2013 06:55:04 -0400 Message-ID: <51A72FFE.9070602@redhat.com> Date: Thu, 30 May 2013 12:54:54 +0200 From: Tomas Henzl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130311 Thunderbird/17.0.4 MIME-Version: 1.0 To: Libo Chen CC: megaraidlinux@lsi.com, JBottomley@parallels.com, linux-scsi@vger.kernel.org, LKML , kashyap.desai@lsi.com, aradford@gmail.com, Li Zefan , Santosh Y Subject: Re: [PATCH RESEND] scsi: megaraid: check kzalloc References: <519ECEF1.9060804@huawei.com> <519F3592.4090207@huawei.com> <51A618A4.2000302@redhat.com> <51A6AD92.2030903@huawei.com> <51A6BA5B.4090008@huawei.com> In-Reply-To: <51A6BA5B.4090008@huawei.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1983 Lines: 62 On 05/30/2013 04:32 AM, Libo Chen wrote: > On 2013/5/30 9:38, Libo Chen wrote: >> On 2013/5/29 23:03, Tomas Henzl wrote: >>> On 05/24/2013 11:40 AM, Libo Chen wrote: >>>> we should check kzalloc, avoid to hit oops >>>> >>>> Signed-off-by: Libo Chen >>>> --- >>>> drivers/scsi/megaraid.c | 4 ++++ >>>> 1 files changed, 4 insertions(+), 0 deletions(-) >>>> >>>> instead of checking scmd->device, sdev is more appropriate. >>>> >>>> diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c >>>> index 846f475..6b623cb 100644 >>>> --- a/drivers/scsi/megaraid.c >>>> +++ b/drivers/scsi/megaraid.c >>>> @@ -4161,6 +4161,10 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) >>>> memset(scb, 0, sizeof(scb_t)); >>>> >>>> sdev = kzalloc(sizeof(struct scsi_device), GFP_KERNEL); >>>> + if (sdev) { >>>> + scsi_free_command(GFP_KERNEL, scmd); >>> I think, that a mutex_unlock(&adapter->int_mtx); is also needed >>> Maybe just setting a rval = -ENOMEM and a jump to to some point below? >>> >>> tomash >> thanks for catching this. >> >> when kzalloc broken, fist unlock and then return. I will update later. >> > I think we can put kzalloc outside of mutex_lock(&adapter->int_mtx) ? > phase: Yes, that is also possible, depends on what you prefer. > > mutex_lock kzalloc > kzalloc -> mutex_lock > > >> Libo >> >>>> + return -ENOMEM; >>>> + } >>>> scmd->device = sdev; >>>> >>>> memset(adapter->int_cdb, 0, sizeof(adapter->int_cdb)); >>> >>> . >>> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/