Skip to content

Commit

Permalink
Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Linus Torvalds committed Sep 30, 2005
2 parents a44fe13 + 411b67b commit a2218ca
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions fs/read_write.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit a2218ca

Please sign in to comment.