summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-05-25 11:39:13 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2012-05-30 21:04:55 -0400
commit46ce341b2f176c2611f12ac390adf862e932eb02 (patch)
tree17884033d37ddf08d20b69739aa5a3559c232fc0 /fs
parent3f50fff4dace23d3cfeb195d5cd4ee813cee68b7 (diff)
downloadlinux-3.10-46ce341b2f176c2611f12ac390adf862e932eb02.tar.gz
linux-3.10-46ce341b2f176c2611f12ac390adf862e932eb02.tar.bz2
linux-3.10-46ce341b2f176c2611f12ac390adf862e932eb02.zip
pipe: return -ENOIOCTLCMD instead of -EINVAL on unknown ioctl command
As described in commit 07d106d0a ("vfs: fix up ENOIOCTLCMD error handling"), drivers should return -ENOIOCTLCMD if they receive an ioctl command which they don't understand. Doing so will result in -ENOTTY being returned to userspace, which matches the behaviour of the compat layer if it fails to translate an ioctl command. This patch fixes the pipe ioctl to return -ENOIOCTLCMD instead of -EINVAL when passed an unknown ioctl command. Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/pipe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pipe.c b/fs/pipe.c
index fec5e4ad071..95ebb56de49 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -693,7 +693,7 @@ static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
return put_user(count, (int __user *)arg);
default:
- return -EINVAL;
+ return -ENOIOCTLCMD;
}
}