summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/vfs
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-21 23:23:24 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-21 23:23:24 +0000
commit47705f49649a22f89cb93d15389f6c69b3813f12 (patch)
tree1ea717ec2d9e91d86e682148659ed05959101e8a /pkg/sentry/vfs
parent748bc2111b26653c6f01713437e52807dfce32ce (diff)
parent23070b2e5fab3c777dfd6389b80472ba9d58572e (diff)
Merge release-20200810.0-86-g23070b2e5 (automated)
Diffstat (limited to 'pkg/sentry/vfs')
-rw-r--r--pkg/sentry/vfs/permissions.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/vfs/permissions.go b/pkg/sentry/vfs/permissions.go
index 33389c1df..014b928ed 100644
--- a/pkg/sentry/vfs/permissions.go
+++ b/pkg/sentry/vfs/permissions.go
@@ -271,7 +271,7 @@ func HasCapabilityOnFile(creds *auth.Credentials, cp linux.Capability, kuid auth
// operation must not proceed. Otherwise it returns the max length allowed to
// without violating the limit.
func CheckLimit(ctx context.Context, offset, size int64) (int64, error) {
- fileSizeLimit := limits.FromContext(ctx).Get(limits.FileSize).Cur
+ fileSizeLimit := limits.FromContextOrDie(ctx).Get(limits.FileSize).Cur
if fileSizeLimit > math.MaxInt64 {
return size, nil
}