diff options
| author |   Linus Lüssing <linus.luessing@c0d3.blue> | 2019-04-24 03:19:14 +0200 |
|---|---|---|
| committer |   Simon Wunderlich <sw@simonwunderlich.de> | 2019-05-06 11:40:46 +0200 |
| commit | a3c7cd0cdf1107f891aff847ad481e34df727055 (patch) | |
| tree | 7e22ab7d0e0ec6a22b1095bd2af1b61bf79ad9a2 /net/batman-adv/types.h | |
| parent | batman-adv: Start new development cycle (diff) | |
| download | linux-dev-a3c7cd0cdf1107f891aff847ad481e34df727055.tar.xz linux-dev-a3c7cd0cdf1107f891aff847ad481e34df727055.zip | |
batman-adv: mcast: fix multicast tt/tvlv worker locking
Syzbot has reported some issues with the locking assumptions made for
the multicast tt/tvlv worker: It was able to trigger the WARN_ON() in
batadv_mcast_mla_tt_retract() and batadv_mcast_mla_tt_add().
While hard/not reproduceable for us so far it seems that the
delayed_work_pending() we use might not be quite safe from reordering.
Therefore this patch adds an explicit, new spinlock to protect the
update of the mla_list and flags in bat_priv and then removes the
WARN_ON(delayed_work_pending()).
Reported-by: syzbot+83f2d54ec6b7e417e13f@syzkaller.appspotmail.com
Reported-by: syzbot+050927a651272b145a5d@syzkaller.appspotmail.com
Reported-by: syzbot+979ffc89b87309b1b94b@syzkaller.appspotmail.com
Reported-by: syzbot+f9f3f388440283da2965@syzkaller.appspotmail.com
Fixes: cbebd363b2e9 ("batman-adv: Use own timer for multicast TT and TVLV updates")
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to '')
| -rw-r--r-- | net/batman-adv/types.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index a21b34ed6548..ed0f6a519de5 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1224,6 +1224,11 @@ struct batadv_priv_mcast { unsigned char bridged:1; /** + * @mla_lock: a lock protecting mla_list and mla_flags + */ + spinlock_t mla_lock; + + /** * @num_want_all_unsnoopables: number of nodes wanting unsnoopable IP * traffic */ |