Commit a1d49449 authored May 31, 2012 by Will Deacon Committed by Linus Torvalds May 31, 2012

pipe: return -ENOIOCTLCMD instead of -EINVAL on unknown ioctl command



As described in commit 07d106d0 ("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.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Alan Cox <alan@linux.intel.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent c67e5382

fs/pipe.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}

Admin message