| Message ID | 20180425154827.32251-39-hch@lst.de |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [01/40] net/can: single_open_net needs to be paired with single_release_net | expand |
Christoph Hellwig <hch@lst.de> writes: > The driver proc file hasn't been writeable for a long time, so this is > just dead code. It is possible to chmod this file to get at the write method. Not that I think anyone does. It looks like this code was merged in 2.3.99-pre1 with permissions S_IFREG|S_IRUGO so I don't think the write support was ever finished. That cap_capable in the write method looks down right scary/buggy. Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Eric > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/ide/ide-proc.c | 46 ------------------------------------------ > 1 file changed, 46 deletions(-) > > diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c > index 863db44c7916..b3b8b8822d6a 100644 > --- a/drivers/ide/ide-proc.c > +++ b/drivers/ide/ide-proc.c > @@ -528,58 +528,12 @@ static int ide_driver_proc_open(struct inode *inode, struct file *file) > return single_open(file, ide_driver_proc_show, PDE_DATA(inode)); > } > > -static int ide_replace_subdriver(ide_drive_t *drive, const char *driver) > -{ > - struct device *dev = &drive->gendev; > - int ret = 1; > - int err; > - > - device_release_driver(dev); > - /* FIXME: device can still be in use by previous driver */ > - strlcpy(drive->driver_req, driver, sizeof(drive->driver_req)); > - err = device_attach(dev); > - if (err < 0) > - printk(KERN_WARNING "IDE: %s: device_attach error: %d\n", > - __func__, err); > - drive->driver_req[0] = 0; > - if (dev->driver == NULL) { > - err = device_attach(dev); > - if (err < 0) > - printk(KERN_WARNING > - "IDE: %s: device_attach(2) error: %d\n", > - __func__, err); > - } > - if (dev->driver && !strcmp(dev->driver->name, driver)) > - ret = 0; > - > - return ret; > -} > - > -static ssize_t ide_driver_proc_write(struct file *file, const char __user *buffer, > - size_t count, loff_t *pos) > -{ > - ide_drive_t *drive = PDE_DATA(file_inode(file)); > - char name[32]; > - > - if (!capable(CAP_SYS_ADMIN)) > - return -EACCES; > - if (count > 31) > - count = 31; > - if (copy_from_user(name, buffer, count)) > - return -EFAULT; > - name[count] = '\0'; > - if (ide_replace_subdriver(drive, name)) > - return -EINVAL; > - return count; > -} > - > static const struct file_operations ide_driver_proc_fops = { > .owner = THIS_MODULE, > .open = ide_driver_proc_open, > .read = seq_read, > .llseek = seq_lseek, > .release = single_release, > - .write = ide_driver_proc_write, > }; > > static int ide_media_proc_show(struct seq_file *m, void *v) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index 863db44c7916..b3b8b8822d6a 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c @@ -528,58 +528,12 @@ static int ide_driver_proc_open(struct inode *inode, struct file *file) return single_open(file, ide_driver_proc_show, PDE_DATA(inode)); } -static int ide_replace_subdriver(ide_drive_t *drive, const char *driver) -{ - struct device *dev = &drive->gendev; - int ret = 1; - int err; - - device_release_driver(dev); - /* FIXME: device can still be in use by previous driver */ - strlcpy(drive->driver_req, driver, sizeof(drive->driver_req)); - err = device_attach(dev); - if (err < 0) - printk(KERN_WARNING "IDE: %s: device_attach error: %d\n", - __func__, err); - drive->driver_req[0] = 0; - if (dev->driver == NULL) { - err = device_attach(dev); - if (err < 0) - printk(KERN_WARNING - "IDE: %s: device_attach(2) error: %d\n", - __func__, err); - } - if (dev->driver && !strcmp(dev->driver->name, driver)) - ret = 0; - - return ret; -} - -static ssize_t ide_driver_proc_write(struct file *file, const char __user *buffer, - size_t count, loff_t *pos) -{ - ide_drive_t *drive = PDE_DATA(file_inode(file)); - char name[32]; - - if (!capable(CAP_SYS_ADMIN)) - return -EACCES; - if (count > 31) - count = 31; - if (copy_from_user(name, buffer, count)) - return -EFAULT; - name[count] = '\0'; - if (ide_replace_subdriver(drive, name)) - return -EINVAL; - return count; -} - static const struct file_operations ide_driver_proc_fops = { .owner = THIS_MODULE, .open = ide_driver_proc_open, .read = seq_read, .llseek = seq_lseek, .release = single_release, - .write = ide_driver_proc_write, }; static int ide_media_proc_show(struct seq_file *m, void *v)
The driver proc file hasn't been writeable for a long time, so this is just dead code. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/ide/ide-proc.c | 46 ------------------------------------------ 1 file changed, 46 deletions(-)