diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2017-11-27 09:09:00 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2017-11-27 09:09:00 +0100 |
| commit | d695195a6be9ceaf6e5ecafa2566bf1a378b8613 (patch) | |
| tree | 8041fe29e628bfe1a05e53a86b84bedbaa5208ce /sys/linux | |
| parent | 8257de047b6ceb09374e04e44eb9be489aff2d8a (diff) | |
sys/linux: resolve TODO re argument truncation
Diffstat (limited to 'sys/linux')
| -rw-r--r-- | sys/linux/init.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/linux/init.go b/sys/linux/init.go index 539801c65..56775d268 100644 --- a/sys/linux/init.go +++ b/sys/linux/init.go @@ -165,15 +165,12 @@ func (arch *arch) sanitizeCall(c *prog.Call) { } mode := c.Args[pos].(*prog.ConstArg) dev := c.Args[pos+1].(*prog.ConstArg) + dev.Val = uint64(uint32(dev.Val)) // Char and block devices read/write io ports, kernel memory and do other nasty things. // TODO: not required if executor drops privileges. switch mode.Val & (arch.S_IFREG | arch.S_IFCHR | arch.S_IFBLK | arch.S_IFIFO | arch.S_IFSOCK) { case arch.S_IFREG, arch.S_IFIFO, arch.S_IFSOCK: case arch.S_IFBLK: - // TODO(dvyukov): mknod dev argument is uint32, - // but prog arguments contain not-truncated uint64 values, - // so we can mistakenly assume that this is not loop, when it actually is. - // This is not very harmful, but need to verify other arguments in this function. if dev.Val>>8 == 7 { break // loop } @@ -185,6 +182,7 @@ func (arch *arch) sanitizeCall(c *prog.Call) { } case "syslog": cmd := c.Args[0].(*prog.ConstArg) + cmd.Val = uint64(uint32(cmd.Val)) // These disable console output, but we need it. if cmd.Val == arch.SYSLOG_ACTION_CONSOLE_OFF || cmd.Val == arch.SYSLOG_ACTION_CONSOLE_ON { cmd.Val = arch.SYSLOG_ACTION_SIZE_UNREAD |