Merge master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / fs / read_write.c

diff --git a/fs/read_write.c b/fs/read_write.c
index b60324a..a091ee4 100644 (file)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -497,6 +497,9 @@ static ssize_t do_readv_writev(int type, struct file *file,
        }
 
        ret = rw_verify_area(type, file, pos, tot_len);
+       if (ret)
+               goto out;
+       ret = security_file_permission(file, type == READ ? MAY_READ : MAY_WRITE);
        if (ret)
                goto out;