diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 08:44:29 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 08:44:29 -0800 |
commit | b47711bfbcd4eb77ca61ef0162487b20e023ae55 (patch) | |
tree | b2a695dbd40f7ca2333664cf946ef34eda7b7dba /fs/splice.c | |
parent | 7556afa0e0e436cad4f560ee83e5fbd5dac9359a (diff) | |
parent | 2e08c0c1c3977a5ddc88887dd3af1b26c433e9d0 (diff) | |
download | linux-3.10-b47711bfbcd4eb77ca61ef0162487b20e023ae55.tar.gz linux-3.10-b47711bfbcd4eb77ca61ef0162487b20e023ae55.tar.bz2 linux-3.10-b47711bfbcd4eb77ca61ef0162487b20e023ae55.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
selinux: make mls_compute_sid always polyinstantiate
security/selinux: constify function pointer tables and fields
security: add a secctx_to_secid() hook
security: call security_file_permission from rw_verify_area
security: remove security_sb_post_mountroot hook
Security: remove security.h include from mm.h
Security: remove security_file_mmap hook sparse-warnings (NULL as 0).
Security: add get, set, and cloning of superblock security information
security/selinux: Add missing "space"
Diffstat (limited to 'fs/splice.c')
-rw-r--r-- | fs/splice.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/splice.c b/fs/splice.c index 6bdcb6107bc..56b802bfbfa 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -908,10 +908,6 @@ 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); } @@ -934,10 +930,6 @@ 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); } |