From 92ef709d4e93ef3cfe07f9bcd4dc816cc05a5904 Mon Sep 17 00:00:00 2001 From: Simon Arlott Date: Sun, 11 Feb 2007 19:48:23 +0000 Subject: ide: Modify capabilities a bit so SMART still works. --- drivers/ide/ide.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index c750f6c..56d9260 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -1326,12 +1326,12 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device #endif /* CONFIG_IDE_TASK_IOCTL */ case HDIO_DRIVE_CMD: - if (!capable(CAP_SYS_RAWIO)) + if (!capable(CAP_SYS_ADMIN)) return -EACCES; return ide_cmd_ioctl(drive, cmd, arg); case HDIO_DRIVE_TASK: - if (!capable(CAP_SYS_RAWIO)) + if (!capable(CAP_SYS_ADMIN)) return -EACCES; return ide_task_ioctl(drive, cmd, arg); @@ -1339,7 +1339,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device { hw_regs_t hw; int args[3]; - if (!capable(CAP_SYS_RAWIO)) return -EACCES; + if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO)) return -EACCES; if (copy_from_user(args, p, 3 * sizeof(int))) return -EFAULT; memset(&hw, 0, sizeof(hw)); @@ -1351,7 +1351,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device return 0; } case HDIO_UNREGISTER_HWIF: - if (!capable(CAP_SYS_RAWIO)) return -EACCES; + if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO)) return -EACCES; /* (arg > MAX_HWIFS) checked in function */ ide_unregister(arg); return 0; -- 1.5.0.1