Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759828Ab3E3Bix (ORCPT ); Wed, 29 May 2013 21:38:53 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:45253 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754763Ab3E3Bir (ORCPT ); Wed, 29 May 2013 21:38:47 -0400 Message-ID: <51A6AD92.2030903@huawei.com> Date: Thu, 30 May 2013 09:38:26 +0800 From: Libo Chen User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: Tomas Henzl CC: , , , LKML , , , 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> In-Reply-To: <51A618A4.2000302@redhat.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.135.72.158] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1424 Lines: 51 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. 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-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/