From bf795d2418ee298ddc73171829d6dc4914c22a46 Mon Sep 17 00:00:00 2001
From: Andrea Claudi <aclaudi@redhat.com>
Date: Tue, 9 Jun 2020 15:45:56 +0200
Subject: [PATCH] tc: add NLA_F_NESTED flag to all actions options nested block
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1844637
Upstream Status: iproute2.git commit 18aa9f5583e94
commit 18aa9f5583e94abc7204b2376b819ede1180da97
Author: Paul Blakey <paulb@mellanox.com>
Date: Thu Jul 11 11:14:25 2019 +0300
tc: add NLA_F_NESTED flag to all actions options nested block
Strict netlink validation now requires this flag on all nested
attributes, add it for action options.
Signed-off-by: Paul Blakey <paulb@mellanox.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
---
tc/m_action.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tc/m_action.c b/tc/m_action.c
index c46aeaafa8ebf..4da810c8c0aa7 100644
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -214,7 +214,8 @@ done0:
tail = addattr_nest(n, MAX_MSG, ++prio);
addattr_l(n, MAX_MSG, TCA_ACT_KIND, k, strlen(k) + 1);
- ret = a->parse_aopt(a, &argc, &argv, TCA_ACT_OPTIONS,
+ ret = a->parse_aopt(a, &argc, &argv,
+ TCA_ACT_OPTIONS | NLA_F_NESTED,
n);
if (ret < 0) {
--
2.26.2