diff options
Diffstat (limited to 'batman-adv/patches/0028-batman-adv-Fix-netlink-dumping-of-BLA-claims.patch')
| -rw-r--r-- | batman-adv/patches/0028-batman-adv-Fix-netlink-dumping-of-BLA-claims.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/batman-adv/patches/0028-batman-adv-Fix-netlink-dumping-of-BLA-claims.patch b/batman-adv/patches/0028-batman-adv-Fix-netlink-dumping-of-BLA-claims.patch new file mode 100644 index 0000000..953316e --- /dev/null +++ b/batman-adv/patches/0028-batman-adv-Fix-netlink-dumping-of-BLA-claims.patch @@ -0,0 +1,62 @@ +From: Sven Eckelmann <sven@narfation.org> +Date: Sat, 24 Feb 2018 12:03:36 +0100 +Subject: [PATCH] batman-adv: Fix netlink dumping of BLA claims + +The function batadv_bla_claim_dump_bucket must be able to handle +non-complete dumps of a single bucket. It tries to do that by saving the +latest dumped index in *idx_skip to inform the caller about the current +state. + +But the caller only assumes that buckets were not completely dumped when +the return code is non-zero. This function must therefore also return a +non-zero index when the dumping of an entry failed. Otherwise the caller +will just skip all remaining buckets. + +And the function must also reset *idx_skip back to zero when it finished a +bucket. Otherwise it will skip the same number of entries in the next +bucket as the previous one had. + +Fixes: 3b7a63606020 ("batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink") +Reported-by: Linus Lüssing <linus.luessing@c0d3.blue> +Signed-off-by: Sven Eckelmann <sven@narfation.org> +Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/49197c00f82cfcfeef963ef9367841d38a6ff207 +--- + net/batman-adv/bridge_loop_avoidance.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c +index 1e6e5d4468ad50c221ea5a0d436678d16c5e154f..4784469cadd4364b6239ce9ff0d1c7cc254de439 100644 +--- a/net/batman-adv/bridge_loop_avoidance.c ++++ b/net/batman-adv/bridge_loop_avoidance.c +@@ -2149,22 +2149,25 @@ batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, + { + struct batadv_bla_claim *claim; + int idx = 0; ++ int ret = 0; + + rcu_read_lock(); + hlist_for_each_entry_rcu(claim, head, hash_entry) { + if (idx++ < *idx_skip) + continue; +- if (batadv_bla_claim_dump_entry(msg, portid, seq, +- primary_if, claim)) { ++ ++ ret = batadv_bla_claim_dump_entry(msg, portid, seq, ++ primary_if, claim); ++ if (ret) { + *idx_skip = idx - 1; + goto unlock; + } + } + +- *idx_skip = idx; ++ *idx_skip = 0; + unlock: + rcu_read_unlock(); +- return 0; ++ return ret; + } + + /** |