Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755156AbYADHfr (ORCPT ); Fri, 4 Jan 2008 02:35:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751667AbYADHfk (ORCPT ); Fri, 4 Jan 2008 02:35:40 -0500 Received: from fg-out-1718.google.com ([72.14.220.152]:50130 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751426AbYADHfj (ORCPT ); Fri, 4 Jan 2008 02:35:39 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; b=SwKTOv+JmQ1vCn9d8cdGirpvoQ4OWMQIlv9kOFgGzMmF9CbBCdRkrBAW2Hv3tjQ3wo+Dt0SgHzfb9QemOdLlw7Q6ZvoFnCUV3XCE8dTwh7iJCg3lrRy6HuzSSmLSXHxPdikQMZ/FtobkieFdLZI0/waOtHQRw369lykAc+Re0F8= Date: Fri, 4 Jan 2008 15:38:58 +0800 From: Dave Young To: jens.axboe@oracle.com Cc: amir@boom.org.il, linux-kernel@vger.kernel.org Subject: Re: [PATCH][BUG 3879] add some check before scsi_cmd_ioctl Message-ID: <20080104073858.GA3084@darkstar.te-china.tietoenator.com> References: <20080104072826.GA3021@darkstar.te-china.tietoenator.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080104072826.GA3021@darkstar.te-china.tietoenator.com> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3052 Lines: 110 On Fri, Jan 04, 2008 at 03:28:26PM +0800, Dave Young wrote: > The behaviour of eject/lock_door ioctl is not consistent, so add some check before scsi_cmd_ioctl. > > Signed-off-by: Dave Young > > --- > drivers/cdrom/cdrom.c | 42 ++++++++++++++++++++++++++++++++++++------ > 1 file changed, 36 insertions(+), 6 deletions(-) > Sorry, should be this one: The behaviour of eject/lock_door ioctl is not consistent, so add some check before scsi_cmd_ioctl. Signed-off-by: Dave Young --- drivers/cdrom/cdrom.c | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff -upr linux/drivers/cdrom/cdrom.c linux.new/drivers/cdrom/cdrom.c --- linux/drivers/cdrom/cdrom.c 2008-01-04 15:32:09.000000000 +0800 +++ linux.new/drivers/cdrom/cdrom.c 2008-01-04 15:34:00.000000000 +0800 @@ -2236,14 +2236,22 @@ static int cdrom_ioctl_multisession(stru return 0; } -static int cdrom_ioctl_eject(struct cdrom_device_info *cdi) +static int cdrom_eject_check(struct cdrom_device_info *cdi) { - cdinfo(CD_DO_IOCTL, "entering CDROMEJECT\n"); - if (!CDROM_CAN(CDC_OPEN_TRAY)) return -ENOSYS; if (cdi->use_count != 1 || keeplocked) return -EBUSY; + return 0; +} + +static int cdrom_ioctl_eject(struct cdrom_device_info *cdi) +{ + cdinfo(CD_DO_IOCTL, "entering CDROMEJECT\n"); + + /* + * cdrom_eject_check is done in cdrom_ioctl. + */ if (CDROM_CAN(CDC_LOCK)) { int ret = cdi->ops->lock_door(cdi, 0); if (ret) @@ -2392,22 +2400,31 @@ static int cdrom_ioctl_reset(struct cdro return cdi->ops->reset(cdi); } -static int cdrom_ioctl_lock_door(struct cdrom_device_info *cdi, +static int cdrom_lock_door_check(struct cdrom_device_info *cdi, unsigned long arg) { - cdinfo(CD_DO_IOCTL, "%socking door.\n", arg ? "L" : "Unl"); - if (!CDROM_CAN(CDC_LOCK)) return -EDRIVE_CANT_DO_THIS; - - keeplocked = arg ? 1 : 0; - /* * Don't unlock the door on multiple opens by default, but allow * root to do so. */ if (cdi->use_count != 1 && !arg && !capable(CAP_SYS_ADMIN)) return -EBUSY; + + return 0; +} + + +static int cdrom_ioctl_lock_door(struct cdrom_device_info *cdi, + unsigned long arg) +{ + cdinfo(CD_DO_IOCTL, "%socking door.\n", arg ? "L" : "Unl"); + + /* + * cdrom_lock_door_check is done in cdrom_ioctl. + */ + keeplocked = arg ? 1 : 0; return cdi->ops->lock_door(cdi, arg); } @@ -2701,6 +2718,18 @@ int cdrom_ioctl(struct file * file, stru int ret; struct gendisk *disk = ip->i_bdev->bd_disk; + if (cmd == CDROMEJECT) { + ret = cdrom_eject_check(cdi); + if (ret) + return ret; + } + + if (cmd == CDROM_LOCKDOOR) { + ret = cdrom_lock_door_check(cdi, arg); + if (ret) + return ret; + } + /* * Try the generic SCSI command ioctl's first. */ -- 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/