diff options
| author | Andrew Morton <akpm@digeo.com> | 2003-02-06 00:22:04 -0800 |
|---|---|---|
| committer | Christoph Hellwig <hch@lab343.munich.sgi.com> | 2003-02-06 00:22:04 -0800 |
| commit | 1dbb976e474aeb880bc8a2d918bbb2f70af073a4 (patch) | |
| tree | 05e2de522b3f25749178b190ac23344fa8714540 | |
| parent | 202b74ebfa3aa288b3a306160febf478978ecee4 (diff) | |
[PATCH] revert extra sendfile security hook patch
hm. It seems that I sent this patch twice.
After resyncing with your tree I go through and try to reapply all the sent
patches, throwing out the ones which get a lot of rejects. Just to make sure
that everything got through OK.
But it appears that that particular patch happily applied on top of itself,
so I assumed it was not applied...
| -rw-r--r-- | fs/read_write.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index bcdf304115e6..04904f7fa206 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -535,10 +535,6 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos, if (retval) goto fput_in; - retval = security_file_permission (in_file, MAY_READ); - if (retval) - goto fput_in; - /* * Get output file, and verify that it is ok.. */ @@ -560,10 +556,6 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos, if (retval) goto fput_out; - retval = security_file_permission (out_file, MAY_WRITE); - if (retval) - goto fput_out; - if (!ppos) ppos = &in_file->f_pos; |