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

This commit is contained in:
Linus Torvalds 2005-09-30 08:38:46 -07:00
commit a2218cac0a

View file

@ -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;