summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
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
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')
-rw-r--r--pkg/sentry/fs/fdpipe/pipe.go5
-rw-r--r--pkg/sentry/fs/host/fs_test.go6
-rw-r--r--pkg/sentry/fs/host/socket.go5
-rw-r--r--pkg/sentry/kernel/task_signals.go10
-rw-r--r--pkg/sentry/syscalls/linux/sys_file.go7
5 files changed, 7 insertions, 26 deletions
diff --git a/pkg/sentry/fs/fdpipe/pipe.go b/pkg/sentry/fs/fdpipe/pipe.go
index f7bbd4aff..7b318e35f 100644
--- a/pkg/sentry/fs/fdpipe/pipe.go
+++ b/pkg/sentry/fs/fdpipe/pipe.go
@@ -90,10 +90,7 @@ func (p *pipeOperations) init() error {
if err := syscall.SetNonblock(p.file.FD(), true); err != nil {
return err
}
- if err := fdnotifier.AddFD(int32(p.file.FD()), &p.Queue); err != nil {
- return err
- }
- return nil
+ return fdnotifier.AddFD(int32(p.file.FD()), &p.Queue)
}
// EventRegister implements waiter.Waitable.EventRegister.
diff --git a/pkg/sentry/fs/host/fs_test.go b/pkg/sentry/fs/host/fs_test.go
index c000afc49..b08125ca8 100644
--- a/pkg/sentry/fs/host/fs_test.go
+++ b/pkg/sentry/fs/host/fs_test.go
@@ -141,11 +141,7 @@ func createTestDirs(ctx context.Context, t *testing.T, m *fs.MountNamespace) err
return err
}
- if err := symlinks.CreateLink(ctx, r, "/symlinks", "recursive"); err != nil {
- return err
- }
-
- return nil
+ return symlinks.CreateLink(ctx, r, "/symlinks", "recursive")
}
// allPaths returns a slice of all paths of entries visible in the rootfs.
diff --git a/pkg/sentry/fs/host/socket.go b/pkg/sentry/fs/host/socket.go
index 8e36ed7ee..467633052 100644
--- a/pkg/sentry/fs/host/socket.go
+++ b/pkg/sentry/fs/host/socket.go
@@ -69,10 +69,7 @@ func (e *endpoint) init() error {
}
e.stype = unix.SockType(stype)
- if err := fdnotifier.AddFD(int32(e.fd), &e.queue); err != nil {
- return err
- }
- return nil
+ return fdnotifier.AddFD(int32(e.fd), &e.queue)
}
// newEndpoint creates a new host endpoint.
diff --git a/pkg/sentry/kernel/task_signals.go b/pkg/sentry/kernel/task_signals.go
index 2340256b0..e4ef7fd67 100644
--- a/pkg/sentry/kernel/task_signals.go
+++ b/pkg/sentry/kernel/task_signals.go
@@ -127,10 +127,7 @@ func (t *Task) dequeueSignalLocked() *arch.SignalInfo {
if info := t.pendingSignals.dequeue(t.tr.SignalMask); info != nil {
return info
}
- if info := t.tg.pendingSignals.dequeue(t.tr.SignalMask); info != nil {
- return info
- }
- return nil
+ return t.tg.pendingSignals.dequeue(t.tr.SignalMask)
}
// TakeSignal returns a pending signal not blocked by mask. Signal handlers are
@@ -144,10 +141,7 @@ func (t *Task) TakeSignal(mask linux.SignalSet) *arch.SignalInfo {
if info := t.pendingSignals.dequeue(mask); info != nil {
return info
}
- if info := t.tg.pendingSignals.dequeue(mask); info != nil {
- return info
- }
- return nil
+ return t.tg.pendingSignals.dequeue(mask)
}
// discardSpecificLocked removes all instances of the given signal from all
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
+ })
})
}