summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/syscalls
diff options
context:
space:
mode:
authorIan Gudger <igudger@google.com>2018-05-08 09:51:07 -0700
committerShentubot <shentubot@google.com>2018-05-08 09:51:56 -0700
commitb4765f782d91443ab0415dc00e727d783632e2ad (patch)
tree82c2b45b7d9fee5ceaf3792e34c5fdf09c69da43 /pkg/sentry/syscalls
parentd0d01a18963ed7cfc29e5b8334e30b1234b6048b (diff)
Fix warning: redundant if ...; err != nil check, just return error instead.
This warning is produced by golint. PiperOrigin-RevId: 195833381 Change-Id: Idd6a7e57e3cfdf00819f2374b19fc113585dc1e1
Diffstat (limited to 'pkg/sentry/syscalls')
-rw-r--r--pkg/sentry/syscalls/linux/sys_file.go7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_file.go b/pkg/sentry/syscalls/linux/sys_file.go
index a2dbba7e0..5fbacc15e 100644
--- a/pkg/sentry/syscalls/linux/sys_file.go
+++ b/pkg/sentry/syscalls/linux/sys_file.go
@@ -460,14 +460,11 @@ func accessAt(t *kernel.Task, dirFD kdefs.FD, addr usermem.Addr, resolve bool, m
creds: creds,
}
- if err := d.Inode.CheckPermission(ctx, fs.PermMask{
+ return d.Inode.CheckPermission(ctx, fs.PermMask{
Read: mode&rOK != 0,
Write: mode&wOK != 0,
Execute: mode&xOK != 0,
- }); err != nil {
- return err
- }
- return nil
+ })
})
}