| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 3 Jun 2024 20:31:19 +0200
From: Adrian Moreno <amorenoz@...hat.com>
To: netdev@...r.kernel.org
Cc: aconole@...hat.com,
Adrian Moreno <amorenoz@...hat.com>,
Pravin B Shelar <pshelar@....org>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Shuah Khan <shuah@...nel.org>,
dev@...nvswitch.org,
linux-kselftest@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH net-next 1/2] selftests: openvswitch: fix action formatting
In the action formatting function ("dpstr"), the iteration is made over
the nla_map, so if there are more than one attribute from the same type
we only print the first one.
Fix this by iterating over the actual attributes.
Signed-off-by: Adrian Moreno <amorenoz@...hat.com>
---
.../selftests/net/openvswitch/ovs-dpctl.py | 48 +++++++++++--------
1 file changed, 27 insertions(+), 21 deletions(-)
diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py
index 1dd057afd3fb..b76907ac0092 100644
--- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py
+++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py
@@ -437,40 +437,46 @@ class ovsactions(nla):
def dpstr(self, more=False):
print_str = ""
- for field in self.nla_map:
- if field[1] == "none" or self.get_attr(field[0]) is None:
+ for attr_name, value in self["attrs"]:
+ attr_desc = next(filter(lambda x: x[0] == attr_name, self.nla_map),
+ None)
+ if not attr_desc:
+ raise ValueError("Unknown attribute: %s" % attr)
+
+ attr_type = attr_desc[1]
+
+ if attr_type == "none":
continue
if print_str != "":
print_str += ","
- if field[1] == "uint32":
- if field[0] == "OVS_ACTION_ATTR_OUTPUT":
- print_str += "%d" % int(self.get_attr(field[0]))
- elif field[0] == "OVS_ACTION_ATTR_RECIRC":
- print_str += "recirc(0x%x)" % int(self.get_attr(field[0]))
- elif field[0] == "OVS_ACTION_ATTR_TRUNC":
- print_str += "trunc(%d)" % int(self.get_attr(field[0]))
- elif field[0] == "OVS_ACTION_ATTR_DROP":
- print_str += "drop(%d)" % int(self.get_attr(field[0]))
- elif field[1] == "flag":
- if field[0] == "OVS_ACTION_ATTR_CT_CLEAR":
+ if attr_type == "uint32":
+ if attr_name == "OVS_ACTION_ATTR_OUTPUT":
+ print_str += "%d" % int(value)
+ elif attr_name == "OVS_ACTION_ATTR_RECIRC":
+ print_str += "recirc(0x%x)" % int(value)
+ elif attr_name == "OVS_ACTION_ATTR_TRUNC":
+ print_str += "trunc(%d)" % int(value)
+ elif attr_name == "OVS_ACTION_ATTR_DROP":
+ print_str += "drop(%d)" % int(value)
+ elif attr_type == "flag":
+ if attr_name == "OVS_ACTION_ATTR_CT_CLEAR":
print_str += "ct_clear"
- elif field[0] == "OVS_ACTION_ATTR_POP_VLAN":
+ elif attr_name == "OVS_ACTION_ATTR_POP_VLAN":
print_str += "pop_vlan"
- elif field[0] == "OVS_ACTION_ATTR_POP_ETH":
+ elif attr_name == "OVS_ACTION_ATTR_POP_ETH":
print_str += "pop_eth"
- elif field[0] == "OVS_ACTION_ATTR_POP_NSH":
+ elif attr_name == "OVS_ACTION_ATTR_POP_NSH":
print_str += "pop_nsh"
- elif field[0] == "OVS_ACTION_ATTR_POP_MPLS":
+ elif attr_name == "OVS_ACTION_ATTR_POP_MPLS":
print_str += "pop_mpls"
else:
- datum = self.get_attr(field[0])
- if field[0] == "OVS_ACTION_ATTR_CLONE":
+ if attr_name == "OVS_ACTION_ATTR_CLONE":
print_str += "clone("
- print_str += datum.dpstr(more)
+ print_str += value.dpstr(more)
print_str += ")"
else:
- print_str += datum.dpstr(more)
+ print_str += value.dpstr(more)
return print_str
--
2.45.1
Powered by blists - more mailing lists