fix printf

Author: safchain

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

@@ -141,19 +141,21 @@ func FilterToInsts(index int, filter Filter, opts ProgOpts) (asm.Instructions, e
 
 			// check the cgroup id
 			asm.FnGetCurrentCgroupId.Call(),
+			asm.Mov.Reg(asm.R7, asm.R0),
 
 			// printk
-			/*asm.Mov.Reg(asm.R7, asm.R0),
-			asm.Mov.Reg(asm.R3, asm.R0),
-			asm.LoadImm(asm.R2, 2675202386094219606, asm.DWord),
-			asm.StoreMem(asm.RFP, -16, asm.R2, asm.DWord),
-			asm.Mov.Imm(asm.R2, 100),
-			asm.StoreMem(asm.RFP, -8, asm.R2, asm.Half),
-			asm.Mov.Reg(asm.R1, asm.RFP),
-			asm.Add.Imm(asm.R1, -16),
-			asm.Mov.Imm(asm.R2, 10),
-			asm.FnTracePrintk.Call(),
-			asm.Mov.Reg(asm.R0, asm.R7),*/
+			/*
+				asm.Mov.Reg(asm.R3, asm.R0),
+				asm.LoadImm(asm.R2, 2675202386094219606, asm.DWord),
+				asm.StoreMem(asm.RFP, -16, asm.R2, asm.DWord),
+				asm.Mov.Imm(asm.R2, 100),
+				asm.StoreMem(asm.RFP, -8, asm.R2, asm.Half),
+				asm.Mov.Reg(asm.R1, asm.RFP),
+				asm.Add.Imm(asm.R1, -16),
+				asm.Mov.Imm(asm.R2, 10),
+				asm.FnTracePrintk.Call(),
+				asm.Mov.Reg(asm.R0, asm.R7),
+			*/
 
 			// check the cgroup id
 			asm.JEq.Imm(asm.R7, int32(filter.CGroupPathKey.Inode), opts.onMatchLabel),

pkg/security/probe/probe_ebpf.go

@@ -557,7 +557,7 @@ func (p *EBPFProbe) getRawPacketMaps() (rawPacketEventMap, routerMap *lib.Map, e
 	return rawPacketEventMap, routerMap, nil
 }
 
-func (p *EBPFProbe) enableRawPacket(enable bool) err {
+func (p *EBPFProbe) enableRawPacket(enable bool) error {
 	enabledMap, _, err := p.Manager.GetMap("raw_packet_enabled")
 	if err != nil {
 		return err
@@ -615,8 +615,6 @@ func (p *EBPFProbe) setupRawPacketProgs(progSpecs []*lib.ProgramSpec, progKey ui
 
 	// setup tail calls
 	for i, progSpec := range progSpecs {
-		fmt.Printf("PROG!!!!!!! : %d => %s\n", progKey+uint32(i), progSpec.Name)
-
 		if err := p.Manager.UpdateTailCallRoutes(manager.TailCallRoute{
 			Program:       col.Programs[progSpec.Name],
 			Key:           progKey + uint32(i),
@@ -662,8 +660,6 @@ func (p *EBPFProbe) setupRawPacketFilters(rs *rules.RuleSet) error {
 		if err != nil {
 			return err
 		}
-	} else {
-		p.enableRawPacket(false)
 	}
 
 	// add or close if none
@@ -701,8 +697,7 @@ func (p *EBPFProbe) applyRawPacketActionFilters() error {
 }
 
 func (p *EBPFProbe) addRawPacketActionFilter(actionFilter rawpacket.Filter) error {
-
-	fmt.Printf("addRawPacketActionFilter: %+v\n", actionFilter)
+	seclog.Infof("add raw packet action filter: %+v\n", actionFilter)
 
 	if slices.ContainsFunc(p.rawPacketActionFilters, func(af rawpacket.Filter) bool {
 		return actionFilter.RuleID == af.RuleID
@@ -711,7 +706,6 @@ func (p *EBPFProbe) addRawPacketActionFilter(actionFilter rawpacket.Filter) erro
 	}
 	p.rawPacketActionFilters = append(p.rawPacketActionFilters, actionFilter)
 
-	fmt.Printf("p.rawPacketActionFilters: %+v\n", p.rawPacketActionFilters)
 	return p.applyRawPacketActionFilters()
 }
 
@@ -806,11 +800,6 @@ func (p *EBPFProbe) AddActivityDumpHandler(handler backend.ActivityDumpHandler)
 func (p *EBPFProbe) DispatchEvent(event *model.Event, notifyConsumers bool) {
 	logTraceEvent(event.GetEventType(), event)
 
-	if event.GetEventType() == model.RawPacketActionEventType {
-		fmt.Printf("!!!!!!!!!!!!!!!!!!!!!!!!!: %+v\n", event)
-		return
-	}
-
 	// filter out event if already present on a profile
 	p.profileManager.LookupEventInProfiles(event)
 
@@ -2242,6 +2231,9 @@ func (p *EBPFProbe) ApplyRuleSet(rs *rules.RuleSet) (*kfilters.FilterReport, err
 	}
 
 	if p.probe.IsNetworkRawPacketEnabled() {
+		// disable first, and let the following code enable it if needed
+		p.enableRawPacket(false)
+
 		if err := p.setupRawPacketFilters(rs); err != nil {
 			seclog.Errorf("unable to load raw packet filter programs: %v", err)
 		}

pkg/security/secl/rules/model.go

@@ -173,8 +173,6 @@ func (a *ActionDefinition) Check(opts PolicyLoaderOpts) error {
 
 	for _, action := range candidateActions {
 		if !reflect.ValueOf(action).IsNil() {
-			fmt.Printf("action: %+v\n", action)
-
 			if err := action.Check(opts); err != nil {
 				return err
 			}