From: Peter Osterlund <petero2@telia.com>
To: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Cc: "Stephen C. Tweedie" <sct@redhat.com>, Greg K-H <greg@kroah.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@osdl.org>, Jens Axboe <axboe@suse.de>
Subject: Re: [PATCH] Fix root hole in raw device
Date: 22 May 2005 13:55:10 +0200 [thread overview]
Message-ID: <m3ekbz79wh.fsf@telia.com> (raw)
In-Reply-To: <20050517165353.GB29811@parcelfarce.linux.theplanet.co.uk>
Al Viro <viro@parcelfarce.linux.theplanet.co.uk> writes:
> On Tue, May 17, 2005 at 02:04:42PM +0100, Stephen C. Tweedie wrote:
> >
> > On Tue, 2005-05-17 at 05:57, Al Viro wrote:
> >
> > > That is not quite correct. You are passing very odd filp to ->ioctl()...
> > > Old variant gave NULL, which is also not too nice, though.
> >
> > Which would you prefer? I guess that if there _are_ going to be
> > problems, we'd be better off finding them early by passing in the NULL
> > value.
>
> For now I'd rather pass NULL. Longer term (== post 2.6.12, since There Is No
> 2.7(tm)) - just remove the struct file * argument of bdev ioctl and have
> int flags used instead, with "opened for write" and "opened non-blocking"
> passed in it. And switch the inode argument to bdev...
Switching the inode argument to bdev would first require doing the
same switch in cdrom_ioctl(), which the patch below does.
-
This patch changes cdrom_ioctl() to take a struct block_device pointer
instead of a struct inode pointer.
Signed-off-by: Peter Osterlund <petero2@telia.com>
---
linux-petero/drivers/block/paride/pcd.c | 2 +-
linux-petero/drivers/cdrom/cdrom.c | 6 +++---
linux-petero/drivers/cdrom/cdu31a.c | 2 +-
linux-petero/drivers/cdrom/cm206.c | 2 +-
linux-petero/drivers/cdrom/mcdx.c | 2 +-
linux-petero/drivers/cdrom/sbpcd.c | 2 +-
linux-petero/drivers/cdrom/viocd.c | 2 +-
linux-petero/drivers/ide/ide-cd.c | 2 +-
linux-petero/drivers/scsi/sr.c | 2 +-
linux-petero/include/linux/cdrom.h | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff -puN drivers/block/paride/pcd.c~cdrom_ioctl_use_bdev drivers/block/paride/pcd.c
--- linux/drivers/block/paride/pcd.c~cdrom_ioctl_use_bdev 2005-05-22 11:05:25.000000000 +0200
+++ linux-petero/drivers/block/paride/pcd.c 2005-05-22 12:47:07.000000000 +0200
@@ -239,7 +239,7 @@ static int pcd_block_ioctl(struct inode
unsigned cmd, unsigned long arg)
{
struct pcd_unit *cd = inode->i_bdev->bd_disk->private_data;
- return cdrom_ioctl(file, &cd->info, inode, cmd, arg);
+ return cdrom_ioctl(file, &cd->info, inode->i_bdev, cmd, arg);
}
static int pcd_block_media_changed(struct gendisk *disk)
diff -puN drivers/cdrom/cdrom.c~cdrom_ioctl_use_bdev drivers/cdrom/cdrom.c
--- linux/drivers/cdrom/cdrom.c~cdrom_ioctl_use_bdev 2005-05-22 10:58:31.000000000 +0200
+++ linux-petero/drivers/cdrom/cdrom.c 2005-05-22 10:59:59.000000000 +0200
@@ -2196,13 +2196,13 @@ retry:
* mmc_ioct().
*/
int cdrom_ioctl(struct file * file, struct cdrom_device_info *cdi,
- struct inode *ip, unsigned int cmd, unsigned long arg)
+ struct block_device *bdev, unsigned int cmd, unsigned long arg)
{
struct cdrom_device_ops *cdo = cdi->ops;
int ret;
/* Try the generic SCSI command ioctl's first.. */
- ret = scsi_cmd_ioctl(file, ip->i_bdev->bd_disk, cmd, (void __user *)arg);
+ ret = scsi_cmd_ioctl(file, bdev->bd_disk, cmd, (void __user *)arg);
if (ret != -ENOTTY)
return ret;
@@ -2355,7 +2355,7 @@ int cdrom_ioctl(struct file * file, stru
cdinfo(CD_DO_IOCTL, "entering CDROM_RESET\n");
if (!CDROM_CAN(CDC_RESET))
return -ENOSYS;
- invalidate_bdev(ip->i_bdev, 0);
+ invalidate_bdev(bdev, 0);
return cdo->reset(cdi);
}
diff -puN drivers/cdrom/cdu31a.c~cdrom_ioctl_use_bdev drivers/cdrom/cdu31a.c
--- linux/drivers/cdrom/cdu31a.c~cdrom_ioctl_use_bdev 2005-05-22 11:04:28.000000000 +0200
+++ linux-petero/drivers/cdrom/cdu31a.c 2005-05-22 12:47:07.000000000 +0200
@@ -2937,7 +2937,7 @@ static int scd_block_ioctl(struct inode
retval = scd_tray_move(&scd_info, 0);
break;
default:
- retval = cdrom_ioctl(file, &scd_info, inode, cmd, arg);
+ retval = cdrom_ioctl(file, &scd_info, inode->i_bdev, cmd, arg);
}
return retval;
}
diff -puN drivers/cdrom/cm206.c~cdrom_ioctl_use_bdev drivers/cdrom/cm206.c
--- linux/drivers/cdrom/cm206.c~cdrom_ioctl_use_bdev 2005-05-22 11:05:04.000000000 +0200
+++ linux-petero/drivers/cdrom/cm206.c 2005-05-22 12:47:07.000000000 +0200
@@ -1363,7 +1363,7 @@ static int cm206_block_release(struct in
static int cm206_block_ioctl(struct inode *inode, struct file *file,
unsigned cmd, unsigned long arg)
{
- return cdrom_ioctl(file, &cm206_info, inode, cmd, arg);
+ return cdrom_ioctl(file, &cm206_info, inode->i_bdev, cmd, arg);
}
static int cm206_block_media_changed(struct gendisk *disk)
diff -puN drivers/cdrom/mcdx.c~cdrom_ioctl_use_bdev drivers/cdrom/mcdx.c
--- linux/drivers/cdrom/mcdx.c~cdrom_ioctl_use_bdev 2005-05-22 11:03:49.000000000 +0200
+++ linux-petero/drivers/cdrom/mcdx.c 2005-05-22 12:47:07.000000000 +0200
@@ -228,7 +228,7 @@ static int mcdx_block_ioctl(struct inode
unsigned cmd, unsigned long arg)
{
struct s_drive_stuff *p = inode->i_bdev->bd_disk->private_data;
- return cdrom_ioctl(file, &p->info, inode, cmd, arg);
+ return cdrom_ioctl(file, &p->info, inode->i_bdev, cmd, arg);
}
static int mcdx_block_media_changed(struct gendisk *disk)
diff -puN drivers/cdrom/sbpcd.c~cdrom_ioctl_use_bdev drivers/cdrom/sbpcd.c
--- linux/drivers/cdrom/sbpcd.c~cdrom_ioctl_use_bdev 2005-05-22 11:05:10.000000000 +0200
+++ linux-petero/drivers/cdrom/sbpcd.c 2005-05-22 12:47:07.000000000 +0200
@@ -5373,7 +5373,7 @@ static int sbpcd_block_ioctl(struct inod
unsigned cmd, unsigned long arg)
{
struct sbpcd_drive *p = inode->i_bdev->bd_disk->private_data;
- return cdrom_ioctl(file, p->sbpcd_infop, inode, cmd, arg);
+ return cdrom_ioctl(file, p->sbpcd_infop, inode->i_bdev, cmd, arg);
}
static int sbpcd_block_media_changed(struct gendisk *disk)
diff -puN drivers/cdrom/viocd.c~cdrom_ioctl_use_bdev drivers/cdrom/viocd.c
--- linux/drivers/cdrom/viocd.c~cdrom_ioctl_use_bdev 2005-05-22 11:04:56.000000000 +0200
+++ linux-petero/drivers/cdrom/viocd.c 2005-05-22 12:47:07.000000000 +0200
@@ -201,7 +201,7 @@ static int viocd_blk_ioctl(struct inode
unsigned cmd, unsigned long arg)
{
struct disk_info *di = inode->i_bdev->bd_disk->private_data;
- return cdrom_ioctl(file, &di->viocd_info, inode, cmd, arg);
+ return cdrom_ioctl(file, &di->viocd_info, inode->i_bdev, cmd, arg);
}
static int viocd_blk_media_changed(struct gendisk *disk)
diff -puN drivers/ide/ide-cd.c~cdrom_ioctl_use_bdev drivers/ide/ide-cd.c
--- linux/drivers/ide/ide-cd.c~cdrom_ioctl_use_bdev 2005-05-22 11:01:21.000000000 +0200
+++ linux-petero/drivers/ide/ide-cd.c 2005-05-22 12:47:07.000000000 +0200
@@ -3384,7 +3384,7 @@ static int idecd_ioctl (struct inode *in
err = generic_ide_ioctl(info->drive, file, bdev, cmd, arg);
if (err == -EINVAL)
- err = cdrom_ioctl(file, &info->devinfo, inode, cmd, arg);
+ err = cdrom_ioctl(file, &info->devinfo, inode->i_bdev, cmd, arg);
return err;
}
diff -puN drivers/scsi/sr.c~cdrom_ioctl_use_bdev drivers/scsi/sr.c
--- linux/drivers/scsi/sr.c~cdrom_ioctl_use_bdev 2005-05-22 11:01:56.000000000 +0200
+++ linux-petero/drivers/scsi/sr.c 2005-05-22 12:47:08.000000000 +0200
@@ -502,7 +502,7 @@ static int sr_block_ioctl(struct inode *
case SCSI_IOCTL_GET_BUS_NUMBER:
return scsi_ioctl(sdev, cmd, (void __user *)arg);
}
- return cdrom_ioctl(file, &cd->cdi, inode, cmd, arg);
+ return cdrom_ioctl(file, &cd->cdi, inode->i_bdev, cmd, arg);
}
static int sr_block_media_changed(struct gendisk *disk)
diff -puN include/linux/cdrom.h~cdrom_ioctl_use_bdev include/linux/cdrom.h
--- linux/include/linux/cdrom.h~cdrom_ioctl_use_bdev 2005-05-22 11:00:12.000000000 +0200
+++ linux-petero/include/linux/cdrom.h 2005-05-22 11:00:19.000000000 +0200
@@ -990,7 +990,7 @@ extern int cdrom_open(struct cdrom_devic
struct file *fp);
extern int cdrom_release(struct cdrom_device_info *cdi, struct file *fp);
extern int cdrom_ioctl(struct file *file, struct cdrom_device_info *cdi,
- struct inode *ip, unsigned int cmd, unsigned long arg);
+ struct block_device *bdev, unsigned int cmd, unsigned long arg);
extern int cdrom_media_changed(struct cdrom_device_info *);
extern int register_cdrom(struct cdrom_device_info *cdi);
_
--
Peter Osterlund - petero2@telia.com
http://web.telia.com/~u89404340
next prev parent reply other threads:[~2005-05-22 11:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-17 4:37 [GIT PATCH] Stable bugfixes for 2.6.12-rc4 Greg KH
2005-05-17 4:37 ` [PATCH] fix Linux kernel ELF core dump privilege elevation Greg KH
2005-05-17 4:37 ` [PATCH] Fix root hole in raw device Greg KH
2005-05-17 4:37 ` [PATCH] Fix root hole in pktcdvd Greg KH
2005-05-17 5:00 ` Al Viro
2005-05-17 5:54 ` Al Viro
2005-05-17 18:12 ` Peter Osterlund
2005-05-17 15:35 ` Greg KH
2005-05-17 4:57 ` [PATCH] Fix root hole in raw device Al Viro
2005-05-17 7:03 ` Willy Tarreau
2005-05-17 7:07 ` Willy Tarreau
2005-05-17 7:38 ` Al Viro
2005-05-17 7:32 ` Al Viro
2005-05-17 13:04 ` Stephen C. Tweedie
2005-05-17 16:53 ` Al Viro
2005-05-22 11:55 ` Peter Osterlund [this message]
2005-05-22 11:57 ` Peter Osterlund
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3ekbz79wh.fsf@telia.com \
--to=petero2@telia.com \
--cc=akpm@osdl.org \
--cc=axboe@suse.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sct@redhat.com \
--cc=viro@parcelfarce.linux.theplanet.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.