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

+3
+3
fs/read_write.c
··· 499 ret = rw_verify_area(type, file, pos, tot_len); 500 if (ret) 501 goto out; 502 503 fnv = NULL; 504 if (type == READ) {
··· 499 ret = rw_verify_area(type, file, pos, tot_len); 500 if (ret) 501 goto out; 502 + ret = security_file_permission(file, type == READ ? MAY_READ : MAY_WRITE); 503 + if (ret) 504 + goto out; 505 506 fnv = NULL; 507 if (type == READ) {