diff options
| author | Aleksandr Nogikh <wp32pw@gmail.com> | 2024-03-08 17:24:27 +0100 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2024-03-08 16:36:20 +0000 |
| commit | 0b3e125fda2e386091985b4b57231dd19341f64e (patch) | |
| tree | 6fcaa015a5e8caa50b55624a8137b8faa8437865 | |
| parent | 052b897ff963e84cb5f7d41649b6e5f2a74b3268 (diff) | |
Revert "sys/linux: clone args before mutation"
This reverts commit 4097c8d7a8596ddbc9a9db7b7f39c5cbdb1bd742.
| -rw-r--r-- | prog/clone.go | 4 | ||||
| -rw-r--r-- | prog/prog.go | 3 | ||||
| -rw-r--r-- | sys/linux/init_iptables.go | 4 | ||||
| -rw-r--r-- | sys/linux/init_vusb.go | 4 |
4 files changed, 4 insertions, 11 deletions
diff --git a/prog/clone.go b/prog/clone.go index 4523be0eb..029cf94c4 100644 --- a/prog/clone.go +++ b/prog/clone.go @@ -39,10 +39,6 @@ func cloneCall(c *Call, newargs map[*ResultArg]*ResultArg) *Call { return c1 } -func CloneArg(arg Arg) Arg { - return clone(arg, nil) -} - func clone(arg Arg, newargs map[*ResultArg]*ResultArg) Arg { var arg1 Arg switch a := arg.(type) { diff --git a/prog/prog.go b/prog/prog.go index da6f158bc..f93293b64 100644 --- a/prog/prog.go +++ b/prog/prog.go @@ -354,9 +354,6 @@ func (p *Prog) insertBefore(c *Call, calls []*Call) { // replaceArg replaces arg with arg1 in a program. func replaceArg(arg, arg1 Arg) { - if arg == arg1 { - panic("replacing an argument with itself") - } switch a := arg.(type) { case *ConstArg: *a = *arg1.(*ConstArg) diff --git a/sys/linux/init_iptables.go b/sys/linux/init_iptables.go index 95825d33c..7e96662fb 100644 --- a/sys/linux/init_iptables.go +++ b/sys/linux/init_iptables.go @@ -31,7 +31,7 @@ func (arch *arch) generateNetfilterTable(g *prog.Gen, typ prog.Type, dir prog.Di } else { // TODO(dvyukov): try to restore original hook order after mutation // instead of assigning brand new offsets. - arg = prog.CloneArg(old) + arg = old calls = g.MutateArg(arg) } var tableArg *prog.GroupArg @@ -113,7 +113,7 @@ func (arch *arch) generateEbtables(g *prog.Gen, typ prog.Type, dir prog.Dir, old } else { // TODO(dvyukov): try to restore original hook order after mutation // instead of assigning brand new offsets. - arg = prog.CloneArg(old) + arg = old calls = g.MutateArg(arg) } if g.Target().ArgContainsAny(arg) { diff --git a/sys/linux/init_vusb.go b/sys/linux/init_vusb.go index ca645bf45..5e4244f6e 100644 --- a/sys/linux/init_vusb.go +++ b/sys/linux/init_vusb.go @@ -55,7 +55,7 @@ func (arch *arch) generateUsbDeviceDescriptor(g *prog.Gen, typ0 prog.Type, dir p if old == nil { arg = g.GenerateSpecialArg(typ0, dir, &calls) } else { - arg = prog.CloneArg(old) + arg = old calls = g.MutateArg(arg) } if g.Target().ArgContainsAny(arg) { @@ -144,7 +144,7 @@ func (arch *arch) generateUsbHidDeviceDescriptor(g *prog.Gen, typ0 prog.Type, di if old == nil { arg = g.GenerateSpecialArg(typ0, dir, &calls) } else { - arg = prog.CloneArg(old) + arg = old calls = g.MutateArg(arg) } if g.Target().ArgContainsAny(arg) { |