Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=29ce20586be54ceba49c55ae049541398cd2c416 Commit: 29ce20586be54ceba49c55ae049541398cd2c416 Parent: d3f35d98b3b87d2506289320375687c6e9bc53ed Author: James Morris <[EMAIL PROTECTED]> AuthorDate: Fri Jul 13 11:44:32 2007 +0200 Committer: Jens Axboe <[EMAIL PROTECTED]> CommitDate: Fri Jul 13 14:14:29 2007 +0200
security: revalidate rw permissions for sys_splice and sys_vmsplice Revalidate read/write permissions for splice(2) and vmslice(2), in case security policy has changed since the files were opened. Acked-by: Stephen Smalley <[EMAIL PROTECTED]> Signed-off-by: James Morris <[EMAIL PROTECTED]> Signed-off-by: Jens Axboe <[EMAIL PROTECTED]> --- fs/splice.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index ed2ce99..ef80822 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -28,6 +28,7 @@ #include <linux/module.h> #include <linux/syscalls.h> #include <linux/uio.h> +#include <linux/security.h> /* * Attempt to steal a page from a pipe buffer. This should perhaps go into @@ -961,6 +962,10 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, if (unlikely(ret < 0)) return ret; + ret = security_file_permission(out, MAY_WRITE); + if (unlikely(ret < 0)) + return ret; + return out->f_op->splice_write(pipe, out, ppos, len, flags); } @@ -983,6 +988,10 @@ static long do_splice_to(struct file *in, loff_t *ppos, if (unlikely(ret < 0)) return ret; + ret = security_file_permission(in, MAY_READ); + if (unlikely(ret < 0)) + return ret; + return in->f_op->splice_read(in, ppos, pipe, len, flags); } - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html