Format capget/capset arguments

I0225 15:32:10.795034    4166 x:0] [   6]  E capget(0x7f477fdff8c8 {Version: 3, Pid: 0}, 0x7f477fdff8b0)
I0225 15:32:10.795059    4166 x:0] [   6]  X capget(0x7f477fdff8c8 {Version: 3, Pid: 0}, 0x7f477fdff8b0 {Permitted: CAP_CHOWN|CAP_DAC_OVERRIDE|CAP_DAC_READ_SEARCH|CAP_FOWNER|CAP_FSETID|CAP_KILL|CAP_SETGID|CAP_SETUID|CAP_SETPCAP|CAP_LINUX_IMMUTABLE|CAP_NET_BIND_SERVICE|CAP_NET_BROADCAST|CAP_NET_ADMIN|CAP_NET_RAW|CAP_IPC_LOCK|CAP_IPC_OWNER|CAP_SYS_MODULE|CAP_SYS_RAWIO|CAP_SYS_CHROOT|CAP_SYS_PTRACE|CAP_SYS_PACCT|CAP_SYS_ADMIN|CAP_SYS_BOOT|CAP_SYS_NICE|CAP_SYS_RESOURCE|CAP_SYS_TIME|CAP_SYS_TTY_CONFIG|CAP_MKNOD|CAP_LEASE|CAP_AUDIT_WRITE|CAP_AUDIT_CONTROL|CAP_SETFCAP|CAP_MAC_OVERRIDE|CAP_MAC_ADMIN|CAP_SYSLOG|CAP_WAKE_ALARM|CAP_BLOCK_SUSPEND|CAP_AUDIT_READ, Inheritable: CAP_CHOWN|CAP_DAC_OVERRIDE|CAP_DAC_READ_SEARCH|CAP_FOWNER|CAP_FSETID|CAP_KILL|CAP_SETGID|CAP_SETUID|CAP_SETPCAP|CAP_LINUX_IMMUTABLE|CAP_NET_BIND_SERVICE|CAP_NET_BROADCAST|CAP_NET_ADMIN|CAP_NET_RAW|CAP_IPC_LOCK|CAP_IPC_OWNER|CAP_SYS_MODULE|CAP_SYS_RAWIO|CAP_SYS_CHROOT|CAP_SYS_PTRACE|CAP_SYS_PACCT|CAP_SYS_ADMIN|CAP_SYS_BOOT|CAP_SYS_NICE|CAP_SYS_RESOURCE|CAP_SYS_TIME|CAP_SYS_TTY_CONFIG|CAP_MKNOD|CAP_LEASE|CAP_AUDIT_WRITE|CAP_AUDIT_CONTROL|CAP_SETFCAP|CAP_MAC_OVERRIDE|CAP_MAC_ADMIN|CAP_SYSLOG|CAP_WAKE_ALARM|CAP_BLOCK_SUSPEND|CAP_AUDIT_READ, Effective: 0x0}) = 0x0 (3.399?s)
I0225 15:32:10.795114    4166 x:0] [   6]  E capset(0x7f477fdff8c8 {Version: 3, Pid: 0}, 0x7f477fdff8b0 {Permitted: CAP_CHOWN|CAP_DAC_OVERRIDE|CAP_DAC_READ_SEARCH|CAP_FOWNER|CAP_FSETID|CAP_KILL|CAP_SETGID|CAP_SETUID|CAP_SETPCAP|CAP_LINUX_IMMUTABLE|CAP_NET_BIND_SERVICE|CAP_NET_BROADCAST|CAP_NET_ADMIN|CAP_NET_RAW|CAP_IPC_LOCK|CAP_IPC_OWNER|CAP_SYS_MODULE|CAP_SYS_RAWIO|CAP_SYS_CHROOT|CAP_SYS_PTRACE|CAP_SYS_PACCT|CAP_SYS_ADMIN|CAP_SYS_BOOT|CAP_SYS_NICE|CAP_SYS_RESOURCE|CAP_SYS_TIME|CAP_SYS_TTY_CONFIG|CAP_MKNOD|CAP_LEASE|CAP_AUDIT_WRITE|CAP_AUDIT_CONTROL|CAP_SETFCAP|CAP_MAC_OVERRIDE|CAP_MAC_ADMIN|CAP_SYSLOG|CAP_WAKE_ALARM|CAP_BLOCK_SUSPEND|CAP_AUDIT_READ, Inheritable: CAP_CHOWN|CAP_DAC_OVERRIDE|CAP_DAC_READ_SEARCH|CAP_FOWNER|CAP_FSETID|CAP_KILL|CAP_SETGID|CAP_SETUID|CAP_SETPCAP|CAP_LINUX_IMMUTABLE|CAP_NET_BIND_SERVICE|CAP_NET_BROADCAST|CAP_NET_ADMIN|CAP_NET_RAW|CAP_IPC_LOCK|CAP_IPC_OWNER|CAP_SYS_MODULE|CAP_SYS_RAWIO|CAP_SYS_CHROOT|CAP_SYS_PTRACE|CAP_SYS_PACCT|CAP_SYS_ADMIN|CAP_SYS_BOOT|CAP_SYS_NICE|CAP_SYS_RESOURCE|CAP_SYS_TIME|CAP_SYS_TTY_CONFIG|CAP_MKNOD|CAP_LEASE|CAP_AUDIT_WRITE|CAP_AUDIT_CONTROL|CAP_SETFCAP|CAP_MAC_OVERRIDE|CAP_MAC_ADMIN|CAP_SYSLOG|CAP_WAKE_ALARM|CAP_BLOCK_SUSPEND|CAP_AUDIT_READ, Effective: CAP_FOWNER})
I0225 15:32:10.795127    4166 x:0] [   6]  X capset(0x7f477fdff8c8 {Version: 3, Pid: 0}, 0x7f477fdff8b0 {Permitted: CAP_CHOWN|CAP_DAC_OVERRIDE|CAP_DAC_READ_SEARCH|CAP_FOWNER|CAP_FSETID|CAP_KILL|CAP_SETGID|CAP_SETUID|CAP_SETPCAP|CAP_LINUX_IMMUTABLE|CAP_NET_BIND_SERVICE|CAP_NET_BROADCAST|CAP_NET_ADMIN|CAP_NET_RAW|CAP_IPC_LOCK|CAP_IPC_OWNER|CAP_SYS_MODULE|CAP_SYS_RAWIO|CAP_SYS_CHROOT|CAP_SYS_PTRACE|CAP_SYS_PACCT|CAP_SYS_ADMIN|CAP_SYS_BOOT|CAP_SYS_NICE|CAP_SYS_RESOURCE|CAP_SYS_TIME|CAP_SYS_TTY_CONFIG|CAP_MKNOD|CAP_LEASE|CAP_AUDIT_WRITE|CAP_AUDIT_CONTROL|CAP_SETFCAP|CAP_MAC_OVERRIDE|CAP_MAC_ADMIN|CAP_SYSLOG|CAP_WAKE_ALARM|CAP_BLOCK_SUSPEND|CAP_AUDIT_READ, Inheritable: CAP_CHOWN|CAP_DAC_OVERRIDE|CAP_DAC_READ_SEARCH|CAP_FOWNER|CAP_FSETID|CAP_KILL|CAP_SETGID|CAP_SETUID|CAP_SETPCAP|CAP_LINUX_IMMUTABLE|CAP_NET_BIND_SERVICE|CAP_NET_BROADCAST|CAP_NET_ADMIN|CAP_NET_RAW|CAP_IPC_LOCK|CAP_IPC_OWNER|CAP_SYS_MODULE|CAP_SYS_RAWIO|CAP_SYS_CHROOT|CAP_SYS_PTRACE|CAP_SYS_PACCT|CAP_SYS_ADMIN|CAP_SYS_BOOT|CAP_SYS_NICE|CAP_SYS_RESOURCE|CAP_SYS_TIME|CAP_SYS_TTY_CONFIG|CAP_MKNOD|CAP_LEASE|CAP_AUDIT_WRITE|CAP_AUDIT_CONTROL|CAP_SETFCAP|CAP_MAC_OVERRIDE|CAP_MAC_ADMIN|CAP_SYSLOG|CAP_WAKE_ALARM|CAP_BLOCK_SUSPEND|CAP_AUDIT_READ, Effective: CAP_FOWNER}) = 0x0 (3.062?s)

Not the most readable, but better than just a pointer.

PiperOrigin-RevId: 236338875
Change-Id: I4b83f778122ab98de3874e16f4258dae18da916b
This commit is contained in:
Michael Pratt
2019-03-01 10:46:36 -08:00
committed by Shentubot
parent 088c6522b2
commit 7693b7469f
5 changed files with 257 additions and 2 deletions
+1
View File
@@ -6,6 +6,7 @@ package(licenses = ["notice"])
go_library(
name = "strace",
srcs = [
"capability.go",
"clone.go",
"futex.go",
"linux64.go",
+176
View File
@@ -0,0 +1,176 @@
// Copyright 2019 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package strace
import (
"gvisor.googlesource.com/gvisor/pkg/abi"
"gvisor.googlesource.com/gvisor/pkg/abi/linux"
)
// CapabilityBitset is the set of capabilties in a bitset.
var CapabilityBitset = abi.FlagSet{
{
Flag: 1 << uint32(linux.CAP_CHOWN),
Name: "CAP_CHOWN",
},
{
Flag: 1 << uint32(linux.CAP_DAC_OVERRIDE),
Name: "CAP_DAC_OVERRIDE",
},
{
Flag: 1 << uint32(linux.CAP_DAC_READ_SEARCH),
Name: "CAP_DAC_READ_SEARCH",
},
{
Flag: 1 << uint32(linux.CAP_FOWNER),
Name: "CAP_FOWNER",
},
{
Flag: 1 << uint32(linux.CAP_FSETID),
Name: "CAP_FSETID",
},
{
Flag: 1 << uint32(linux.CAP_KILL),
Name: "CAP_KILL",
},
{
Flag: 1 << uint32(linux.CAP_SETGID),
Name: "CAP_SETGID",
},
{
Flag: 1 << uint32(linux.CAP_SETUID),
Name: "CAP_SETUID",
},
{
Flag: 1 << uint32(linux.CAP_SETPCAP),
Name: "CAP_SETPCAP",
},
{
Flag: 1 << uint32(linux.CAP_LINUX_IMMUTABLE),
Name: "CAP_LINUX_IMMUTABLE",
},
{
Flag: 1 << uint32(linux.CAP_NET_BIND_SERVICE),
Name: "CAP_NET_BIND_SERVICE",
},
{
Flag: 1 << uint32(linux.CAP_NET_BROADCAST),
Name: "CAP_NET_BROADCAST",
},
{
Flag: 1 << uint32(linux.CAP_NET_ADMIN),
Name: "CAP_NET_ADMIN",
},
{
Flag: 1 << uint32(linux.CAP_NET_RAW),
Name: "CAP_NET_RAW",
},
{
Flag: 1 << uint32(linux.CAP_IPC_LOCK),
Name: "CAP_IPC_LOCK",
},
{
Flag: 1 << uint32(linux.CAP_IPC_OWNER),
Name: "CAP_IPC_OWNER",
},
{
Flag: 1 << uint32(linux.CAP_SYS_MODULE),
Name: "CAP_SYS_MODULE",
},
{
Flag: 1 << uint32(linux.CAP_SYS_RAWIO),
Name: "CAP_SYS_RAWIO",
},
{
Flag: 1 << uint32(linux.CAP_SYS_CHROOT),
Name: "CAP_SYS_CHROOT",
},
{
Flag: 1 << uint32(linux.CAP_SYS_PTRACE),
Name: "CAP_SYS_PTRACE",
},
{
Flag: 1 << uint32(linux.CAP_SYS_PACCT),
Name: "CAP_SYS_PACCT",
},
{
Flag: 1 << uint32(linux.CAP_SYS_ADMIN),
Name: "CAP_SYS_ADMIN",
},
{
Flag: 1 << uint32(linux.CAP_SYS_BOOT),
Name: "CAP_SYS_BOOT",
},
{
Flag: 1 << uint32(linux.CAP_SYS_NICE),
Name: "CAP_SYS_NICE",
},
{
Flag: 1 << uint32(linux.CAP_SYS_RESOURCE),
Name: "CAP_SYS_RESOURCE",
},
{
Flag: 1 << uint32(linux.CAP_SYS_TIME),
Name: "CAP_SYS_TIME",
},
{
Flag: 1 << uint32(linux.CAP_SYS_TTY_CONFIG),
Name: "CAP_SYS_TTY_CONFIG",
},
{
Flag: 1 << uint32(linux.CAP_MKNOD),
Name: "CAP_MKNOD",
},
{
Flag: 1 << uint32(linux.CAP_LEASE),
Name: "CAP_LEASE",
},
{
Flag: 1 << uint32(linux.CAP_AUDIT_WRITE),
Name: "CAP_AUDIT_WRITE",
},
{
Flag: 1 << uint32(linux.CAP_AUDIT_CONTROL),
Name: "CAP_AUDIT_CONTROL",
},
{
Flag: 1 << uint32(linux.CAP_SETFCAP),
Name: "CAP_SETFCAP",
},
{
Flag: 1 << uint32(linux.CAP_MAC_OVERRIDE),
Name: "CAP_MAC_OVERRIDE",
},
{
Flag: 1 << uint32(linux.CAP_MAC_ADMIN),
Name: "CAP_MAC_ADMIN",
},
{
Flag: 1 << uint32(linux.CAP_SYSLOG),
Name: "CAP_SYSLOG",
},
{
Flag: 1 << uint32(linux.CAP_WAKE_ALARM),
Name: "CAP_WAKE_ALARM",
},
{
Flag: 1 << uint32(linux.CAP_BLOCK_SUSPEND),
Name: "CAP_BLOCK_SUSPEND",
},
{
Flag: 1 << uint32(linux.CAP_AUDIT_READ),
Name: "CAP_AUDIT_READ",
},
}
+2 -2
View File
@@ -142,8 +142,8 @@ var linuxAMD64 = SyscallMap{
122: makeSyscallInfo("setfsuid", Hex),
123: makeSyscallInfo("setfsgid", Hex),
124: makeSyscallInfo("getsid", Hex),
125: makeSyscallInfo("capget", Hex, Hex),
126: makeSyscallInfo("capset", Hex, Hex),
125: makeSyscallInfo("capget", CapHeader, PostCapData),
126: makeSyscallInfo("capset", CapHeader, CapData),
127: makeSyscallInfo("rt_sigpending", Hex),
128: makeSyscallInfo("rt_sigtimedwait", SigSet, Hex, Timespec, Hex),
129: makeSyscallInfo("rt_sigqueueinfo", Hex, Signal, Hex),
+67
View File
@@ -271,6 +271,67 @@ func rusage(t *kernel.Task, addr usermem.Addr) string {
return fmt.Sprintf("%#x %+v", addr, ru)
}
func capHeader(t *kernel.Task, addr usermem.Addr) string {
if addr == 0 {
return "null"
}
var hdr linux.CapUserHeader
if _, err := t.CopyIn(addr, &hdr); err != nil {
return fmt.Sprintf("%#x (error decoding header: %s)", addr, err)
}
var version string
switch hdr.Version {
case linux.LINUX_CAPABILITY_VERSION_1:
version = "1"
case linux.LINUX_CAPABILITY_VERSION_2:
version = "2"
case linux.LINUX_CAPABILITY_VERSION_3:
version = "3"
default:
version = strconv.FormatUint(uint64(hdr.Version), 16)
}
return fmt.Sprintf("%#x {Version: %s, Pid: %d}", addr, version, hdr.Pid)
}
func capData(t *kernel.Task, hdrAddr, dataAddr usermem.Addr) string {
if dataAddr == 0 {
return "null"
}
var hdr linux.CapUserHeader
if _, err := t.CopyIn(hdrAddr, &hdr); err != nil {
return fmt.Sprintf("%#x (error decoding header: %v)", dataAddr, err)
}
var p, i, e uint64
switch hdr.Version {
case linux.LINUX_CAPABILITY_VERSION_1:
var data linux.CapUserData
if _, err := t.CopyIn(dataAddr, &data); err != nil {
return fmt.Sprintf("%#x (error decoding data: %v)", dataAddr, err)
}
p = uint64(data.Permitted)
i = uint64(data.Inheritable)
e = uint64(data.Effective)
case linux.LINUX_CAPABILITY_VERSION_2, linux.LINUX_CAPABILITY_VERSION_3:
var data [2]linux.CapUserData
if _, err := t.CopyIn(dataAddr, &data); err != nil {
return fmt.Sprintf("%#x (error decoding data: %v)", dataAddr, err)
}
p = uint64(data[0].Permitted) | (uint64(data[1].Permitted) << 32)
i = uint64(data[0].Inheritable) | (uint64(data[1].Inheritable) << 32)
e = uint64(data[0].Effective) | (uint64(data[1].Effective) << 32)
default:
return fmt.Sprintf("%#x (unknown version %d)", dataAddr, hdr.Version)
}
return fmt.Sprintf("%#x {Permitted: %s, Inheritable: %s, Effective: %s}", dataAddr, CapabilityBitset.Parse(p), CapabilityBitset.Parse(i), CapabilityBitset.Parse(e))
}
// pre fills in the pre-execution arguments for a system call. If an argument
// cannot be interpreted before the system call is executed, then a hex value
// will be used. Note that a full output slice will always be provided, that is
@@ -341,6 +402,10 @@ func (i *SyscallInfo) pre(t *kernel.Task, args arch.SyscallArguments, maximumBlo
output = append(output, sigSet(t, args[arg].Pointer()))
case SigAction:
output = append(output, sigAction(t, args[arg].Pointer()))
case CapHeader:
output = append(output, capHeader(t, args[arg].Pointer()))
case CapData:
output = append(output, capData(t, args[arg-1].Pointer(), args[arg].Pointer()))
case Oct:
output = append(output, "0o"+strconv.FormatUint(args[arg].Uint64(), 8))
case Hex:
@@ -403,6 +468,8 @@ func (i *SyscallInfo) post(t *kernel.Task, args arch.SyscallArguments, rval uint
output[arg] = sigSet(t, args[arg].Pointer())
case PostSigAction:
output[arg] = sigAction(t, args[arg].Pointer())
case PostCapData:
output[arg] = capData(t, args[arg-1].Pointer(), args[arg].Pointer())
}
}
}
+11
View File
@@ -188,6 +188,17 @@ const (
// PostSigAction is a struct sigaction, formatted after syscall execution.
PostSigAction
// CapHeader is a cap_user_header_t.
CapHeader
// CapData is the data argument to capget(2)/capset(2). The previous
// argument must be CapHeader.
CapData
// PostCapData is the data argument to capget(2)/capset(2), formatted
// after syscall execution. The previous argument must be CapHeader.
PostCapData
)
// defaultFormat is the syscall argument format to use if the actual format is