Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6

a2218cac · Linus Torvalds · a44fe13e · 411b67b4 · a2218cac
Commit a2218cac authored Sep 30, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

fs/read_write.c fs/read_write.c +3 -0

No files found.
--- 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;