Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934894Ab3DHLnE (ORCPT ); Mon, 8 Apr 2013 07:43:04 -0400 Received: from seldrel01.sonyericsson.com ([212.209.106.2]:19443 "EHLO seldrel01.sonyericsson.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761649Ab3DHLnC (ORCPT ); Mon, 8 Apr 2013 07:43:02 -0400 From: Oskar Andero Date: Mon, 8 Apr 2013 13:42:58 +0200 To: "linux-kernel@vger.kernel.org" , "linux-scsi@vger.kernel.org" CC: "JBottomley@parallels.com" , "Lekanovic, Radovan" , "Itou, Syunsuke X" Subject: Re: [PATCH] scsi: fix null pointer dereference in sd_revalidate_disk Message-ID: <20130408114251.GK2481@caracas.corpusers.net> References: <1362663400-9517-1-git-send-email-oskar.andero@sonymobile.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <1362663400-9517-1-git-send-email-oskar.andero@sonymobile.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1877 Lines: 57 On 14:36 Thu 07 Mar , oskar.andero@sonymobile.com wrote: > From: "syunsuke.x.itou" > > By repeatadly connecting/disconnecting a USB masstorage device > a null pointer dereference can be provoked. This is caused by > sd_revalidate_disk() assuming sdkp to be a valid pointer. This > patch adds a null pointer check. > > Reviewed-by: Radovan Lekanovic > Signed-off-by: syunsuke.x.itou > Signed-off-by: Oskar Andero > --- > drivers/scsi/sd.c | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c > index 7992635..49849ce 100644 > --- a/drivers/scsi/sd.c > +++ b/drivers/scsi/sd.c > @@ -1,6 +1,7 @@ > /* > * sd.c Copyright (C) 1992 Drew Eckhardt > * Copyright (C) 1993, 1994, 1995, 1999 Eric Youngdale > + * Copyright (C) 2013 Sony Mobile Communications AB. > * > * Linux scsi disk driver > * Initial versions: Drew Eckhardt > @@ -2653,10 +2654,14 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp) > static int sd_revalidate_disk(struct gendisk *disk) > { > struct scsi_disk *sdkp = scsi_disk(disk); > - struct scsi_device *sdp = sdkp->device; > + struct scsi_device *sdp; > unsigned char *buffer; > unsigned flush = 0; > > + if (!sdkp) > + return -ENODEV; > + sdp = sdkp->device; > + > SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, > "sd_revalidate_disk\n")); > > -- > 1.7.8.6 > Ping. Any input on the patch above? Thanks, -Oskar -- 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/