diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-11-04 07:49:35 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-11-04 07:49:35 +0100 |
commit | 2a3ede8cb2ddee5885518e4232aca13056f9a6e0 (patch) | |
tree | 79b2b4e060a97b1e7c60d58549f8c97cb15db5dd /drivers/scsi/aacraid/linit.c | |
parent | 0e73453e172aaa38fd59fd4d3fc589e8fc9b9a70 (diff) | |
parent | 215432ed30393ed4a8f77db0a1fe34523c48cdba (diff) |
Merge branch 'perf/urgent' into perf/core to fix conflicts
Conflicts:
tools/perf/bench/numa.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/scsi/aacraid/linit.c')
-rw-r--r-- | drivers/scsi/aacraid/linit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 408a42ef787..f0d432c139d 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -771,6 +771,8 @@ static long aac_compat_do_ioctl(struct aac_dev *dev, unsigned cmd, unsigned long static int aac_compat_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) { struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata; + if (!capable(CAP_SYS_RAWIO)) + return -EPERM; return aac_compat_do_ioctl(dev, cmd, (unsigned long)arg); } |