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
+		})
 	})
 }