naccyde / rpms / iproute

Forked from rpms/iproute 9 months ago
Clone

Blame SOURCES/0034-tc-add-NLA_F_NESTED-flag-to-all-actions-options-nest.patch

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