| commit | a2218cac0aacecbecebd3cabc43cc8a4a09cecbb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Sep 30 08:38:46 2005 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Sep 30 08:38:46 2005 -0700 |
| tree | 70bc7d07d3af54f125c28154684c1394a1a6bd66 | |
| parent | a44fe13eab664ac488ced0845d9885b019bd24c5 [diff] | |
| parent | 411b67b4b6a4dd1e0292a6a58dd753978179d173 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6
diff --git a/fs/read_write.c b/fs/read_write.c index b60324a..a091ee4 100644 --- a/fs/read_write.c +++ b/fs/read_write.c
@@ -499,6 +499,9 @@ 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; fnv = NULL; if (type == READ) {