summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/strace
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-12-16 22:43:48 +0000
committergVisor bot <gvisor-bot@google.com>2019-12-16 22:43:48 +0000
commitd646a6798aefea611b06543644112df903ed2428 (patch)
tree2fbdede54ce65bf4f1437ec4a4aa7566e17b60d0 /pkg/sentry/strace
parentc46ddf9c69d71989996115194fbb7b70155396c9 (diff)
parent3193b2fff8149fe43a3a59c266359e7f443a1563 (diff)
Merge release-20191210.0-32-g3193b2f (automated)
Diffstat (limited to 'pkg/sentry/strace')
-rwxr-xr-xpkg/sentry/strace/select.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/strace/select.go b/pkg/sentry/strace/select.go
index 92c18083d..dea309fda 100755
--- a/pkg/sentry/strace/select.go
+++ b/pkg/sentry/strace/select.go
@@ -27,7 +27,7 @@ func fdsFromSet(t *kernel.Task, set []byte) []int {
// Append n if the n-th bit is 1.
for i, v := range set {
for j := 0; j < 8; j++ {
- if (v>>uint(j))&1 == 1 {
+ if (v>>j)&1 == 1 {
fds = append(fds, i*8+j)
}
}
@@ -42,7 +42,7 @@ func fdSet(t *kernel.Task, nfds int, addr usermem.Addr) string {
// Calculate the size of the fd set (one bit per fd).
nBytes := (nfds + 7) / 8
- nBitsInLastPartialByte := uint(nfds % 8)
+ nBitsInLastPartialByte := nfds % 8
set, err := linux.CopyInFDSet(t, addr, nBytes, nBitsInLastPartialByte)
if err != nil {