]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
pipe: return -ENOIOCTLCMD instead of -EINVAL on unknown ioctl command
authorWill Deacon <will.deacon@arm.com>
Fri, 25 May 2012 10:39:13 +0000 (11:39 +0100)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 31 May 2012 01:04:55 +0000 (21:04 -0400)
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>
fs/pipe.c

index fec5e4ad071a36bb8783bdcc8c40c07c614340a5..95ebb56de494de44efb6224ccfee1b96e4169267 100644 (file)
--- 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;
        }
 }