diff options
author | John Stultz <john.stultz@linaro.org> | 2013-04-08 10:45:54 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2013-04-08 10:45:54 -0700 |
commit | 698cb5d58f5498273e71d4797c8b3353535c8de6 (patch) | |
tree | 20f459c3e673a04c82ba2d529fc14efd28c1dcb5 /fs/pipe.c | |
parent | 97c64b5e2132e104a8c25026319b239fce7463f4 (diff) | |
parent | 31880c37c11e28cb81c70757e38392b42e695dc6 (diff) |
Merge remote-tracking branch 'linus/master' into linaro-android-3.9-experimentaltracking-linaro-android-3.9-llct-20130408.0
Update to 3.9-rc6
Conflicts:
arch/arm/mm/cache-l2x0.c
drivers/hid/hid-magicmouse.c
Diffstat (limited to 'fs/pipe.c')
-rw-r--r-- | fs/pipe.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 64a494cef0a0..2234f3f61f8d 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -863,6 +863,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp) { int ret = -ENOENT; + if (!(filp->f_mode & (FMODE_READ|FMODE_WRITE))) + return -EINVAL; + mutex_lock(&inode->i_mutex); if (inode->i_pipe) { |