Commit a2218cac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents a44fe13e 411b67b4

fs/read_write.c

+3 −0
Original line number Diff line number Diff line
@@ -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;