summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorDean Deng <deandeng@google.com>2020-08-28 11:26:25 -0700
committerAndrei Vagin <avagin@gmail.com>2020-09-09 17:53:10 -0700
commit4346e36ba286338f6615eb9b22425808cf186775 (patch)
treea1368577f07269698c7da62506a634ac5e9666b0 /pkg
parentc9842f21ce4a9308dba983fd712cc688b26237d5 (diff)
Fix EOF handling for splice.
Also, add corresponding EOF tests for splice/sendfile. Discovered by syzkaller. PiperOrigin-RevId: 328975990
Diffstat (limited to 'pkg')
-rw-r--r--pkg/sentry/syscalls/linux/vfs2/splice.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/sentry/syscalls/linux/vfs2/splice.go b/pkg/sentry/syscalls/linux/vfs2/splice.go
index 192411393..68ce94778 100644
--- a/pkg/sentry/syscalls/linux/vfs2/splice.go
+++ b/pkg/sentry/syscalls/linux/vfs2/splice.go
@@ -141,9 +141,14 @@ func Splice(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Syscal
inOffset += n
}
default:
- panic("not possible")
+ panic("at least one end of splice must be a pipe")
}
+ if n == 0 && err == io.EOF {
+ // We reached the end of the file. Eat the error and exit the loop.
+ err = nil
+ break
+ }
if n != 0 || err != syserror.ErrWouldBlock || nonBlock {
break
}