merge Linus head tree into my drm tree and fix up conflicts

[linux-2.6-omap-h63xx.git] / fs / read_write.c

diff --git a/fs/read_write.c b/fs/read_write.c
index b60324aaa2b6731d9ddedd67badaa7b5c9790a60..a091ee4f430df6cc83317b59c4a2fc363c005080 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;