Skip to content

Commit 3ff9856

Browse files
committed
fix printf
1 parent 620457a commit 3ff9856

File tree

3 files changed

+18
-26
lines changed

3 files changed

+18
-26
lines changed

pkg/security/ebpf/probes/rawpacket/pcap.go

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -141,19 +141,21 @@ func FilterToInsts(index int, filter Filter, opts ProgOpts) (asm.Instructions, e
141141

142142
// check the cgroup id
143143
asm.FnGetCurrentCgroupId.Call(),
144+
asm.Mov.Reg(asm.R7, asm.R0),
144145

145146
// printk
146-
/*asm.Mov.Reg(asm.R7, asm.R0),
147-
asm.Mov.Reg(asm.R3, asm.R0),
148-
asm.LoadImm(asm.R2, 2675202386094219606, asm.DWord),
149-
asm.StoreMem(asm.RFP, -16, asm.R2, asm.DWord),
150-
asm.Mov.Imm(asm.R2, 100),
151-
asm.StoreMem(asm.RFP, -8, asm.R2, asm.Half),
152-
asm.Mov.Reg(asm.R1, asm.RFP),
153-
asm.Add.Imm(asm.R1, -16),
154-
asm.Mov.Imm(asm.R2, 10),
155-
asm.FnTracePrintk.Call(),
156-
asm.Mov.Reg(asm.R0, asm.R7),*/
147+
/*
148+
asm.Mov.Reg(asm.R3, asm.R0),
149+
asm.LoadImm(asm.R2, 2675202386094219606, asm.DWord),
150+
asm.StoreMem(asm.RFP, -16, asm.R2, asm.DWord),
151+
asm.Mov.Imm(asm.R2, 100),
152+
asm.StoreMem(asm.RFP, -8, asm.R2, asm.Half),
153+
asm.Mov.Reg(asm.R1, asm.RFP),
154+
asm.Add.Imm(asm.R1, -16),
155+
asm.Mov.Imm(asm.R2, 10),
156+
asm.FnTracePrintk.Call(),
157+
asm.Mov.Reg(asm.R0, asm.R7),
158+
*/
157159

158160
// check the cgroup id
159161
asm.JEq.Imm(asm.R7, int32(filter.CGroupPathKey.Inode), opts.onMatchLabel),

pkg/security/probe/probe_ebpf.go

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ func (p *EBPFProbe) getRawPacketMaps() (rawPacketEventMap, routerMap *lib.Map, e
557557
return rawPacketEventMap, routerMap, nil
558558
}
559559

560-
func (p *EBPFProbe) enableRawPacket(enable bool) err {
560+
func (p *EBPFProbe) enableRawPacket(enable bool) error {
561561
enabledMap, _, err := p.Manager.GetMap("raw_packet_enabled")
562562
if err != nil {
563563
return err
@@ -615,8 +615,6 @@ func (p *EBPFProbe) setupRawPacketProgs(progSpecs []*lib.ProgramSpec, progKey ui
615615

616616
// setup tail calls
617617
for i, progSpec := range progSpecs {
618-
fmt.Printf("PROG!!!!!!! : %d => %s\n", progKey+uint32(i), progSpec.Name)
619-
620618
if err := p.Manager.UpdateTailCallRoutes(manager.TailCallRoute{
621619
Program: col.Programs[progSpec.Name],
622620
Key: progKey + uint32(i),
@@ -662,8 +660,6 @@ func (p *EBPFProbe) setupRawPacketFilters(rs *rules.RuleSet) error {
662660
if err != nil {
663661
return err
664662
}
665-
} else {
666-
p.enableRawPacket(false)
667663
}
668664

669665
// add or close if none
@@ -701,8 +697,7 @@ func (p *EBPFProbe) applyRawPacketActionFilters() error {
701697
}
702698

703699
func (p *EBPFProbe) addRawPacketActionFilter(actionFilter rawpacket.Filter) error {
704-
705-
fmt.Printf("addRawPacketActionFilter: %+v\n", actionFilter)
700+
seclog.Infof("add raw packet action filter: %+v\n", actionFilter)
706701

707702
if slices.ContainsFunc(p.rawPacketActionFilters, func(af rawpacket.Filter) bool {
708703
return actionFilter.RuleID == af.RuleID
@@ -711,7 +706,6 @@ func (p *EBPFProbe) addRawPacketActionFilter(actionFilter rawpacket.Filter) erro
711706
}
712707
p.rawPacketActionFilters = append(p.rawPacketActionFilters, actionFilter)
713708

714-
fmt.Printf("p.rawPacketActionFilters: %+v\n", p.rawPacketActionFilters)
715709
return p.applyRawPacketActionFilters()
716710
}
717711

@@ -806,11 +800,6 @@ func (p *EBPFProbe) AddActivityDumpHandler(handler backend.ActivityDumpHandler)
806800
func (p *EBPFProbe) DispatchEvent(event *model.Event, notifyConsumers bool) {
807801
logTraceEvent(event.GetEventType(), event)
808802

809-
if event.GetEventType() == model.RawPacketActionEventType {
810-
fmt.Printf("!!!!!!!!!!!!!!!!!!!!!!!!!: %+v\n", event)
811-
return
812-
}
813-
814803
// filter out event if already present on a profile
815804
p.profileManager.LookupEventInProfiles(event)
816805

@@ -2242,6 +2231,9 @@ func (p *EBPFProbe) ApplyRuleSet(rs *rules.RuleSet) (*kfilters.FilterReport, err
22422231
}
22432232

22442233
if p.probe.IsNetworkRawPacketEnabled() {
2234+
// disable first, and let the following code enable it if needed
2235+
p.enableRawPacket(false)
2236+
22452237
if err := p.setupRawPacketFilters(rs); err != nil {
22462238
seclog.Errorf("unable to load raw packet filter programs: %v", err)
22472239
}

pkg/security/secl/rules/model.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,6 @@ func (a *ActionDefinition) Check(opts PolicyLoaderOpts) error {
173173

174174
for _, action := range candidateActions {
175175
if !reflect.ValueOf(action).IsNil() {
176-
fmt.Printf("action: %+v\n", action)
177-
178176
if err := action.Check(opts); err != nil {
179177
return err
180178
}

0 commit comments

Comments
 (0)