b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
From: Antonio Quartulli <antonio@meshcoding.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
	Antonio Quartulli <antonio@meshcoding.com>,
	Marek Lindner <mareklindner@neomailbox.ch>
Subject: [B.A.T.M.A.N.] [PATCH 04/10] batman-adv: Make NC capability changes atomic
Date: Fri, 14 Aug 2015 22:57:08 +0200	[thread overview]
Message-ID: <1439585834-26564-5-git-send-email-antonio@meshcoding.com> (raw)
In-Reply-To: <1439585834-26564-1-git-send-email-antonio@meshcoding.com>

From: Linus Lüssing <linus.luessing@c0d3.blue>

Bitwise OR/AND assignments in C aren't guaranteed to be atomic. One
OGM handler might undo the set/clear of a specific bit from another
handler run in between.

Fix this by using the atomic set_bit()/clear_bit()/test_bit() functions.

Fixes: 3f4841ffb336 ("batman-adv: tvlv - add network coding container")
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
 net/batman-adv/network-coding.c | 7 ++++---
 net/batman-adv/types.h          | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index f0a50f3..4660401 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -19,6 +19,7 @@
 #include "main.h"
 
 #include <linux/atomic.h>
+#include <linux/bitops.h>
 #include <linux/byteorder/generic.h>
 #include <linux/compiler.h>
 #include <linux/debugfs.h>
@@ -134,9 +135,9 @@ static void batadv_nc_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
 					  uint16_t tvlv_value_len)
 {
 	if (flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND)
-		orig->capabilities &= ~BATADV_ORIG_CAPA_HAS_NC;
+		clear_bit(BATADV_ORIG_CAPA_HAS_NC, &orig->capabilities);
 	else
-		orig->capabilities |= BATADV_ORIG_CAPA_HAS_NC;
+		set_bit(BATADV_ORIG_CAPA_HAS_NC, &orig->capabilities);
 }
 
 /**
@@ -894,7 +895,7 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv,
 		goto out;
 
 	/* check if orig node is network coding enabled */
-	if (!(orig_node->capabilities & BATADV_ORIG_CAPA_HAS_NC))
+	if (!test_bit(BATADV_ORIG_CAPA_HAS_NC, &orig_node->capabilities))
 		goto out;
 
 	/* accept ogms from 'good' neighbors and single hop neighbors */
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 29fd625..ed4aec5 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -314,7 +314,7 @@ struct batadv_orig_node {
  */
 enum batadv_orig_capabilities {
 	BATADV_ORIG_CAPA_HAS_DAT,
-	BATADV_ORIG_CAPA_HAS_NC = BIT(1),
+	BATADV_ORIG_CAPA_HAS_NC,
 	BATADV_ORIG_CAPA_HAS_TT = BIT(2),
 	BATADV_ORIG_CAPA_HAS_MCAST = BIT(3),
 };
-- 
2.5.0


  parent reply	other threads:[~2015-08-14 20:57 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-14 20:57 [B.A.T.M.A.N.] pull request: batman-adv 20150814 Antonio Quartulli
2015-08-14 20:57 ` [B.A.T.M.A.N.] [PATCH 01/10] batman-adv: Replace gw_reselect divisor with simple shift Antonio Quartulli
2015-08-14 20:57 ` [B.A.T.M.A.N.] [PATCH 02/10] batman-adv: Avoid u32 overflow during gateway select Antonio Quartulli
2015-08-14 20:57 ` [B.A.T.M.A.N.] [PATCH 03/10] batman-adv: Make DAT capability changes atomic Antonio Quartulli
2015-08-14 20:57 ` Antonio Quartulli [this message]
2015-08-14 20:57 ` [B.A.T.M.A.N.] [PATCH 05/10] batman-adv: Make TT " Antonio Quartulli
2015-08-14 20:57 ` [B.A.T.M.A.N.] [PATCH 06/10] batman-adv: Make MCAST " Antonio Quartulli
2015-08-14 20:57 ` [B.A.T.M.A.N.] [PATCH 07/10] batman-adv: Fix potential synchronization issues in mcast tvlv handler Antonio Quartulli
2015-08-14 20:57 ` [B.A.T.M.A.N.] [PATCH 08/10] batman-adv: protect tt request from double deletion Antonio Quartulli
2015-08-14 20:57 ` [B.A.T.M.A.N.] [PATCH 09/10] batman-adv: remove broadcast packets scheduled for purged outgoing if Antonio Quartulli
2015-08-14 20:57 ` [B.A.T.M.A.N.] [PATCH 10/10] batman-adv: Fix potentially broken skb network header access Antonio Quartulli
2015-08-17 21:32 ` [B.A.T.M.A.N.] pull request: batman-adv 20150814 David Miller
  -- strict thread matches above, loose matches on Subject: below --
2015-08-11 16:35 [B.A.T.M.A.N.] pull request: batman-adv 20150811 Antonio Quartulli
2015-08-11 16:35 ` [B.A.T.M.A.N.] [PATCH 04/10] batman-adv: Make NC capability changes atomic Antonio Quartulli
2015-08-11 19:38   ` Sergei Shtylyov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1439585834-26564-5-git-send-email-antonio@meshcoding.com \
    --to=antonio@meshcoding.com \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    --cc=davem@davemloft.net \
    --cc=mareklindner@neomailbox.ch \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).