[B.A.T.M.A.N.] [PATCH v2 1/2] batman-adv: Fix conditional statements indentation

List overview All Threads
Download

newer

older

[B.A.T.M.A.N.] Recover in case of...

[B.A.T.M.A.N.] [PATCHv2] batctl:...

Sven Eckelmann

17 Jul 2015 17 Jul '15

8:03 a.m.

commit 29b9256e6631 ("batman-adv: consider outgoing interface in OGM sending") incorrectly indented the interface check code.

Signed-off-by: Sven Eckelmann sven@narfation.org --- v2: Change commit message to new git commit description style

net/batman-adv/bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index df54118..5c12200 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -968,7 +968,7 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) rcu_read_lock(); list_for_each_entry_rcu(tmp_hard_iface, &batadv_hardif_list, list) { if (tmp_hard_iface->soft_iface != hard_iface->soft_iface) - continue; + continue; batadv_iv_ogm_queue_add(bat_priv, *ogm_buff, *ogm_buff_len, hard_iface, tmp_hard_iface, 1, send_time);

-- 2.1.4

Show replies by date

Sven Eckelmann

17 Jul 17 Jul

8:03 a.m.

New subject: [B.A.T.M.A.N.] [PATCH v2 2/2] batman-adv: Avoid crashing kernel with multicast asserts

The BUG_ON added to the multicast code in commit 7f220ed1f063 ("batman-adv: Fix potential synchronization issues in mcast tvlv handler") will crash the kernel when the statement is true. This is not strictly required and a WARN_ON is enough to raise attention.

Signed-off-by: Sven Eckelmann sven@narfation.org --- v2: Change commit message to new git commit description style

net/batman-adv/multicast.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 25ed931..d71c70e 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -618,7 +618,7 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,

spin_lock_bh(&bat_priv->mcast.want_lists_lock); /* flag checks above + mcast_handler_lock prevents this */ - BUG_ON(!hlist_unhashed(node)); + WARN_ON(!hlist_unhashed(node));

hlist_add_head_rcu(node, head); spin_unlock_bh(&bat_priv->mcast.want_lists_lock); @@ -629,7 +629,7 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,

spin_lock_bh(&bat_priv->mcast.want_lists_lock); /* flag checks above + mcast_handler_lock prevents this */ - BUG_ON(hlist_unhashed(node)); + WARN_ON(hlist_unhashed(node));

hlist_del_init_rcu(node); spin_unlock_bh(&bat_priv->mcast.want_lists_lock); @@ -663,7 +663,7 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,

spin_lock_bh(&bat_priv->mcast.want_lists_lock); /* flag checks above + mcast_handler_lock prevents this */ - BUG_ON(!hlist_unhashed(node)); + WARN_ON(!hlist_unhashed(node));

hlist_add_head_rcu(node, head); spin_unlock_bh(&bat_priv->mcast.want_lists_lock); @@ -674,7 +674,7 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,

spin_lock_bh(&bat_priv->mcast.want_lists_lock); /* flag checks above + mcast_handler_lock prevents this */ - BUG_ON(hlist_unhashed(node)); + WARN_ON(hlist_unhashed(node));

hlist_del_init_rcu(node); spin_unlock_bh(&bat_priv->mcast.want_lists_lock); @@ -708,7 +708,7 @@ static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,

spin_lock_bh(&bat_priv->mcast.want_lists_lock); /* flag checks above + mcast_handler_lock prevents this */ - BUG_ON(!hlist_unhashed(node)); + WARN_ON(!hlist_unhashed(node));

hlist_add_head_rcu(node, head); spin_unlock_bh(&bat_priv->mcast.want_lists_lock); @@ -719,7 +719,7 @@ static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,

spin_lock_bh(&bat_priv->mcast.want_lists_lock); /* flag checks above + mcast_handler_lock prevents this */ - BUG_ON(hlist_unhashed(node)); + WARN_ON(hlist_unhashed(node));

hlist_del_init_rcu(node); spin_unlock_bh(&bat_priv->mcast.want_lists_lock);

-- 2.1.4

Linus Lüssing

19 Jul 19 Jul

1:28 p.m.

New subject: [B.A.T.M.A.N.] [PATCH v2 2/2] batman-adv: Avoid crashing kernel with multicast asserts

Sounds good, that'll probably spare us some discussions about BUG_ON()s on netdev :).

Acked-by: Linus Lüssing linus.luessing@c0d3.blue

On Fri, Jul 17, 2015 at 10:03:43AM +0200, Sven Eckelmann wrote:

...

The BUG_ON added to the multicast code in commit 7f220ed1f063 ("batman-adv: Fix potential synchronization issues in mcast tvlv handler") will crash the kernel when the statement is true. This is not strictly required and a WARN_ON is enough to raise attention.

Signed-off-by: Sven Eckelmann sven@narfation.org

v2: Change commit message to new git commit description style

net/batman-adv/multicast.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 25ed931..d71c70e 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -618,7 +618,7 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,
spin_lock_bh(&bat_priv->mcast.want_lists_lock);
/* flag checks above + mcast_handler_lock prevents this */
BUG_ON(!hlist_unhashed(node));
WARN_ON(!hlist_unhashed(node));
hlist_add_head_rcu(node, head); spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
@@ -629,7 +629,7 @@ static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,
spin_lock_bh(&bat_priv->mcast.want_lists_lock);
/* flag checks above + mcast_handler_lock prevents this */
BUG_ON(hlist_unhashed(node));
WARN_ON(hlist_unhashed(node));
hlist_del_init_rcu(node); spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
@@ -663,7 +663,7 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,
spin_lock_bh(&bat_priv->mcast.want_lists_lock);
/* flag checks above + mcast_handler_lock prevents this */
BUG_ON(!hlist_unhashed(node));
WARN_ON(!hlist_unhashed(node));
hlist_add_head_rcu(node, head); spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
@@ -674,7 +674,7 @@ static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,
spin_lock_bh(&bat_priv->mcast.want_lists_lock);
/* flag checks above + mcast_handler_lock prevents this */
BUG_ON(hlist_unhashed(node));
WARN_ON(hlist_unhashed(node));
hlist_del_init_rcu(node); spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
@@ -708,7 +708,7 @@ static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,
spin_lock_bh(&bat_priv->mcast.want_lists_lock);
/* flag checks above + mcast_handler_lock prevents this */
BUG_ON(!hlist_unhashed(node));
WARN_ON(!hlist_unhashed(node));
hlist_add_head_rcu(node, head); spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
@@ -719,7 +719,7 @@ static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,
spin_lock_bh(&bat_priv->mcast.want_lists_lock);
/* flag checks above + mcast_handler_lock prevents this */
BUG_ON(hlist_unhashed(node));
WARN_ON(hlist_unhashed(node));
hlist_del_init_rcu(node); spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
-- 2.1.4

Marek Lindner

20 Jul 20 Jul

5:50 a.m.

New subject: [B.A.T.M.A.N.] [PATCH v2 2/2] batman-adv: Avoid crashing kernel with multicast asserts

On Sunday, July 19, 2015 15:28:23 Linus Lüssing wrote:

...

Sounds good, that'll probably spare us some discussions about BUG_ON()s on netdev :).

Acked-by: Linus Lüssing linus.luessing@c0d3.blue

Applied in revision 7ad001a.

Thanks, Marek

Marek Lindner

19 Jul 19 Jul

8:45 a.m.

On Friday, July 17, 2015 10:03:42 Sven Eckelmann wrote:

...

commit 29b9256e6631 ("batman-adv: consider outgoing interface in OGM sending") incorrectly indented the interface check code.

Signed-off-by: Sven Eckelmann sven@narfation.org

v2: Change commit message to new git commit description style

net/batman-adv/bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Applied in revision a25feff.

Thanks, Marek

3414

Age (days ago)

3417

Last active (days ago)

b.a.t.m.a.n@lists.open-mesh.org

4 comments

3 participants

tags (0)

participants (3)

Linus Lüssing
Marek Lindner
Sven Eckelmann