summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJamie Liu <jamieliu@google.com>2019-01-28 10:59:01 -0800
committerShentubot <shentubot@google.com>2019-01-28 11:00:23 -0800
commit1cedccf8e9b63757c182477f803afcb27bd9e17e (patch)
tree08451a5d9f5286cf64b1b64e1c7fa36819db1c1f
parenta8b8e13154fe39396b9139e8409cb822bbe0a68a (diff)
Drop the one-page limit for /proc/[pid]/{cmdline,environ}.
It never actually should have applied to environ (the relevant change in Linux 4.2 is c2c0bb44620d "proc: fix PAGE_SIZE limit of /proc/$PID/cmdline"), and we claim to be Linux 4.4 now anyway. PiperOrigin-RevId: 231250661 Change-Id: I37f9c4280a533d1bcb3eebb7803373ac3c7b9f15
-rw-r--r--pkg/sentry/fs/proc/exec_args.go6
1 files changed, 0 insertions, 6 deletions
diff --git a/pkg/sentry/fs/proc/exec_args.go b/pkg/sentry/fs/proc/exec_args.go
index ddda67f54..a716eb5f5 100644
--- a/pkg/sentry/fs/proc/exec_args.go
+++ b/pkg/sentry/fs/proc/exec_args.go
@@ -101,12 +101,6 @@ func (f *execArgFile) Read(ctx context.Context, _ *fs.File, dst usermem.IOSequen
return 0, syserror.EINVAL
}
- // N.B. Linux 4.2 eliminates the arbitrary one page limit.
- if offset > usermem.PageSize {
- return 0, io.EOF
- }
- dst = dst.TakeFirst64(usermem.PageSize - offset)
-
m, err := getTaskMM(f.t)
if err != nil {
return 0, err