summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2019-07-07 22:15:13 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-09-10 10:35:10 +0100
commitfa689968da499a6094228d9409e1cf100290de8a (patch)
tree15e0539a2be07dfc129792974bb0e6e936407f54
parenta4c88340b3ea8caefa1b5d3422bd9925c74b566e (diff)
downloadlinux-stable-fa689968da499a6094228d9409e1cf100290de8a.tar.gz
linux-stable-fa689968da499a6094228d9409e1cf100290de8a.tar.bz2
linux-stable-fa689968da499a6094228d9409e1cf100290de8a.zip
batman-adv: Fix netlink dumping of all mcast_flags buckets
[ Upstream commit fa3a03da549a889fc9dbc0d3c5908eb7882cac8f ] The bucket variable is only updated outside the loop over the mcast_flags buckets. It will only be updated during a dumping run when the dumping has to be interrupted and a new message has to be started. This could result in repeated or missing entries when the multicast flags are dumped to userspace. Fixes: d2d489b7d851 ("batman-adv: Add inconsistent multicast netlink dump detection") Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--net/batman-adv/multicast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index ec54e236e345..50fe9dfb088b 100644
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -1653,7 +1653,7 @@ __batadv_mcast_flags_dump(struct sk_buff *msg, u32 portid,
while (bucket_tmp < hash->size) {
if (batadv_mcast_flags_dump_bucket(msg, portid, cb, hash,
- *bucket, &idx_tmp))
+ bucket_tmp, &idx_tmp))
break;
bucket_tmp++;