From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1756759AbZHFVUL@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756759AbZHFVUL (ORCPT <rfc822;w@1wt.eu>);
	Thu, 6 Aug 2009 17:20:11 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756248AbZHFVUK
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 6 Aug 2009 17:20:10 -0400
Received: from bedivere.hansenpartnership.com ([66.63.167.143]:34666 "EHLO
	bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1756232AbZHFVUJ (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 6 Aug 2009 17:20:09 -0400
Subject: Re: [PATCH 3/3] drivers/scsi: Add kmalloc NULL tests
From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Julia Lawall <julia@diku.dk>
Cc: Jens Axboe <axboe@kernel.dk>, linux-scsi@vger.kernel.org,
       linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
In-Reply-To: <Pine.LNX.4.64.0908062205190.19100@ask.diku.dk>
References: <Pine.LNX.4.64.0908062205190.19100@ask.diku.dk>
Content-Type: text/plain
Date: Thu, 06 Aug 2009 21:20:04 +0000
Message-Id: <1249593604.10463.18.camel@mulgrave.site>
Mime-Version: 1.0
X-Mailer: Evolution 2.24.1.1 
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, 2009-08-06 at 22:06 +0200, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
> 
> Check that the result of kmalloc is not NULL before passing it to other
> functions.
> 
> The semantic match that finds this problem is as follows:
> (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @@
> expression *x;
> identifier f;
> constant char *C;
> @@
> 
> x = \(kmalloc\|kcalloc\|kzalloc\)(...);
> ... when != x == NULL
>     when != x != NULL
>     when != (x || ...)
> (
> kfree(x)
> |
> f(...,C,...,x,...)
> |
> *f(...,x,...)
> |
> *x->f
> )
> // </smpl>
> 
> Signed-off-by: Julia Lawall <julia@diku.dk>
> 
> ---
>  drivers/scsi/sr.c                   |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
> index cce0fe4..3fbf42e 100644
> --- a/drivers/scsi/sr.c
> +++ b/drivers/scsi/sr.c
> @@ -211,6 +211,8 @@ static int sr_media_change(struct cdrom_device_info *cdi, int slot)
>  	}
>  
>  	sshdr =  kzalloc(sizeof(*sshdr), GFP_KERNEL);
> +	if (!sshdr)
> +		return -ENOMEM;

this isn't necessary; sr_test_unit_ready is designed to take a NULL
pointer for sshdr ... it's just slightly less useful when this happens,
but it still returns some status.

James


>  	retval = sr_test_unit_ready(cd->device, sshdr);
>  	if (retval || (scsi_sense_valid(sshdr) &&
>  		       /* 0x3a is medium not present */
> --
> 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