TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

splice/tee/vmsplice: validate flags

Browse Source 
Long overdue...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2016-12-10 13:17:32 -05:00
parent f81dc7d7d5
commit 3d6ea290f3
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/splice.c
View File

@@ -1351,6 +1351,8 @@ SYSCALL_DEFINE4(vmsplice, int, fd, const struct iovec __user *, iov,
struct fd f; struct fd f;
long error; long error;
if (unlikely(flags & ~SPLICE_F_ALL))
return -EINVAL;
if (unlikely(nr_segs > UIO_MAXIOV)) if (unlikely(nr_segs > UIO_MAXIOV))
return -EINVAL; return -EINVAL;
else if (unlikely(!nr_segs)) else if (unlikely(!nr_segs))
@@ -1401,6 +1403,9 @@ SYSCALL_DEFINE6(splice, int, fd_in, loff_t __user *, off_in,
if (unlikely(!len)) if (unlikely(!len))
return 0; return 0;
if (unlikely(flags & ~SPLICE_F_ALL))
return -EINVAL;
error = -EBADF; error = -EBADF;
in = fdget(fd_in); in = fdget(fd_in);
if (in.file) { if (in.file) {
@@ -1729,6 +1734,9 @@ SYSCALL_DEFINE4(tee, int, fdin, int, fdout, size_t, len, unsigned int, flags)
struct fd in; struct fd in;
int error; int error;
if (unlikely(flags & ~SPLICE_F_ALL))
return -EINVAL;
if (unlikely(!len)) if (unlikely(!len))
return 0; return 0;

2
include/linux/splice.h
View File

@@ -20,6 +20,8 @@
#define SPLICE_F_MORE (0x04) /* expect more data */ #define SPLICE_F_MORE (0x04) /* expect more data */
#define SPLICE_F_GIFT (0x08) /* pages passed in are a gift */ #define SPLICE_F_GIFT (0x08) /* pages passed in are a gift */
#define SPLICE_F_ALL (SPLICE_F_MOVE|SPLICE_F_NONBLOCK|SPLICE_F_MORE|SPLICE_F_GIFT)
/* /*
* Passed to the actors * Passed to the actors
*/ */