Commit 50b1c6b2 authored Feb 24, 2018 by Sven Eckelmann Committed by Greg Kroah-Hartman May 30, 2018

batman-adv: Fix netlink dumping of BLA claims



[ Upstream commit b0264ecdfeab5f889b02ec54af7ca8cc1c245e2f ]

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: 04f3f5bf ("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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent d31ae952

net/batman-adv/bridge_loop_avoidance.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

		/**