|
 |
1dc35b |
From 0a966eeecf8aa14924fd3ae221946c92417e6d71 Mon Sep 17 00:00:00 2001
|
|
|
1dc35b |
From: Phil Sutter <phil@nwl.cc>
|
|
|
1dc35b |
Date: Thu, 7 Feb 2019 09:20:10 +0100
|
|
|
1dc35b |
Subject: [PATCH] nft: Eliminate dead code in __nft_rule_list
|
|
|
1dc35b |
|
|
|
1dc35b |
If passed a rulenum > 0, the function uses nftnl_rule_lookup_byindex()
|
|
|
1dc35b |
and returns early. Negative rulenum values are not supposed to happen,
|
|
|
1dc35b |
so the remaining code which iterates over the full list of rules does
|
|
|
1dc35b |
not need to respect rulenum anymore.
|
|
|
1dc35b |
|
|
|
1dc35b |
Fixes: 039b048965210 ("nft: Make use of nftnl_rule_lookup_byindex()")
|
|
|
1dc35b |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
1dc35b |
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
|
1dc35b |
(cherry picked from commit 519f5bcd9c07e0092a1a019176c82fb3bfbd9ced)
|
|
|
1dc35b |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
1dc35b |
---
|
|
|
1dc35b |
iptables/nft.c | 13 +------------
|
|
|
1dc35b |
1 file changed, 1 insertion(+), 12 deletions(-)
|
|
|
1dc35b |
|
|
|
1dc35b |
diff --git a/iptables/nft.c b/iptables/nft.c
|
|
|
1dc35b |
index 2d527358cc7f2..d708fb6176b88 100644
|
|
|
1dc35b |
--- a/iptables/nft.c
|
|
|
1dc35b |
+++ b/iptables/nft.c
|
|
|
1dc35b |
@@ -2331,18 +2331,7 @@ __nft_rule_list(struct nft_handle *h, struct nftnl_chain *c,
|
|
|
1dc35b |
|
|
|
1dc35b |
r = nftnl_rule_iter_next(iter);
|
|
|
1dc35b |
while (r != NULL) {
|
|
|
1dc35b |
- rule_ctr++;
|
|
|
1dc35b |
-
|
|
|
1dc35b |
- if (rulenum > 0 && rule_ctr != rulenum) {
|
|
|
1dc35b |
- /* List by rule number case */
|
|
|
1dc35b |
- goto next;
|
|
|
1dc35b |
- }
|
|
|
1dc35b |
-
|
|
|
1dc35b |
- cb(r, rule_ctr, format);
|
|
|
1dc35b |
- if (rulenum > 0)
|
|
|
1dc35b |
- break;
|
|
|
1dc35b |
-
|
|
|
1dc35b |
-next:
|
|
|
1dc35b |
+ cb(r, ++rule_ctr, format);
|
|
|
1dc35b |
r = nftnl_rule_iter_next(iter);
|
|
|
1dc35b |
}
|
|
|
1dc35b |
|
|
|
1dc35b |
--
|
|
|
1dc35b |
2.21.0
|
|
|
1dc35b |
|