diff options
author | Zhengyu He <hzy@google.com> | 2018-06-01 13:39:53 -0700 |
---|---|---|
committer | Shentubot <shentubot@google.com> | 2018-06-01 13:40:52 -0700 |
commit | d1ca50d49e52338feb1d46b69725b9ac21cc3ccc (patch) | |
tree | 11e0bcef11cffe780a407775f02f57ee2d142c5f /pkg/bpf | |
parent | 65dadc00297d946e86b2e95b0279fb6dc94542dd (diff) |
Add SyscallRules that supports argument filtering
PiperOrigin-RevId: 198919043
Change-Id: I7f1f0a3b3430cd0936a4ee4fc6859aab71820bdf
Diffstat (limited to 'pkg/bpf')
-rw-r--r-- | pkg/bpf/program_builder.go | 64 |
1 files changed, 48 insertions, 16 deletions
diff --git a/pkg/bpf/program_builder.go b/pkg/bpf/program_builder.go index 7554d47c1..bad56d7ac 100644 --- a/pkg/bpf/program_builder.go +++ b/pkg/bpf/program_builder.go @@ -21,7 +21,10 @@ import ( "gvisor.googlesource.com/gvisor/pkg/abi/linux" ) -const labelTarget = math.MaxUint8 +const ( + labelTarget = math.MaxUint8 + labelDirectTarget = math.MaxUint32 +) // ProgramBuilder assists with building a BPF program with jump // labels that are resolved to their proper offsets. @@ -47,6 +50,14 @@ type label struct { target int } +type jmpType int + +const ( + jDirect jmpType = iota + jTrue + jFalse +) + // source contains information about a single reference to a label. type source struct { // Program line where the label reference is present. @@ -54,7 +65,7 @@ type source struct { // True if label reference is in the 'jump if true' part of the jump. // False if label reference is in the 'jump if false' part of the jump. - jt bool + jt jmpType } // AddStmt adds a new statement to the program. @@ -67,23 +78,29 @@ func (b *ProgramBuilder) AddJump(code uint16, k uint32, jt, jf uint8) { b.instructions = append(b.instructions, Jump(code, k, jt, jf)) } +// AddDirectJumpLabel adds a new jump to the program where is labelled. +func (b *ProgramBuilder) AddDirectJumpLabel(labelName string) { + b.addLabelSource(labelName, jDirect) + b.AddJump(Jmp|Ja, labelDirectTarget, 0, 0) +} + // AddJumpTrueLabel adds a new jump to the program where 'jump if true' is a label. func (b *ProgramBuilder) AddJumpTrueLabel(code uint16, k uint32, jtLabel string, jf uint8) { - b.addLabelSource(jtLabel, true) + b.addLabelSource(jtLabel, jTrue) b.AddJump(code, k, labelTarget, jf) } // AddJumpFalseLabel adds a new jump to the program where 'jump if false' is a label. func (b *ProgramBuilder) AddJumpFalseLabel(code uint16, k uint32, jt uint8, jfLabel string) { - b.addLabelSource(jfLabel, false) - b.AddJump(code, k, jt, math.MaxUint8) + b.addLabelSource(jfLabel, jFalse) + b.AddJump(code, k, jt, labelTarget) } // AddJumpLabels adds a new jump to the program where both jump targets are labels. func (b *ProgramBuilder) AddJumpLabels(code uint16, k uint32, jtLabel, jfLabel string) { - b.addLabelSource(jtLabel, true) - b.addLabelSource(jfLabel, false) - b.AddJump(code, k, math.MaxUint8, math.MaxUint8) + b.addLabelSource(jtLabel, jTrue) + b.addLabelSource(jfLabel, jFalse) + b.AddJump(code, k, labelTarget, labelTarget) } // AddLabel sets the given label name at the current location. The next instruction is executed @@ -104,20 +121,22 @@ func (b *ProgramBuilder) AddLabel(name string) error { // Instructions returns an array of BPF instructions representing the program with all labels // resolved. Return error in case label resolution failed due to an invalid program. +// +// N.B. Partial results will be returned in the error case, which is useful for debugging. func (b *ProgramBuilder) Instructions() ([]linux.BPFInstruction, error) { if err := b.resolveLabels(); err != nil { - return nil, err + return b.instructions, err } return b.instructions, nil } -func (b *ProgramBuilder) addLabelSource(labelName string, jt bool) { +func (b *ProgramBuilder) addLabelSource(labelName string, t jmpType) { l, ok := b.labels[labelName] if !ok { l = &label{sources: make([]source, 0), target: -1} b.labels[labelName] = l } - l.sources = append(l.sources, source{line: len(b.instructions), jt: jt}) + l.sources = append(l.sources, source{line: len(b.instructions), jt: t}) } func (b *ProgramBuilder) resolveLabels() error { @@ -136,21 +155,34 @@ func (b *ProgramBuilder) resolveLabels() error { } // Calculates the jump offset from current line. offset := v.target - s.line - 1 - if offset > math.MaxUint8 { - return fmt.Errorf("jump offset to label '%v' is too large: %v", key, offset) - } // Sets offset into jump instruction. - if s.jt { + switch s.jt { + case jDirect: + if offset > labelDirectTarget { + return fmt.Errorf("jump offset to label '%v' is too large: %v, inst: %v, lineno: %v", key, offset, inst, s.line) + } + if inst.K != labelDirectTarget { + return fmt.Errorf("jump target is not a label") + } + inst.K = uint32(offset) + case jTrue: + if offset > labelTarget { + return fmt.Errorf("jump offset to label '%v' is too large: %v, inst: %v, lineno: %v", key, offset, inst, s.line) + } if inst.JumpIfTrue != labelTarget { return fmt.Errorf("jump target is not a label") } inst.JumpIfTrue = uint8(offset) - } else { + case jFalse: + if offset > labelTarget { + return fmt.Errorf("jump offset to label '%v' is too large: %v, inst: %v, lineno: %v", key, offset, inst, s.line) + } if inst.JumpIfFalse != labelTarget { return fmt.Errorf("jump target is not a label") } inst.JumpIfFalse = uint8(offset) } + b.instructions[s.line] = inst } } |