From: "Linus Lüssing" <linus.luessing@c0d3.blue>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCHv2 maint 1/5] batman-adv: Make DAT capability changes atomic
Date: Tue, 16 Jun 2015 14:44:31 +0200 [thread overview]
Message-ID: <1434458675-3343-2-git-send-email-linus.luessing@c0d3.blue> (raw)
In-Reply-To: <1434458675-3343-1-git-send-email-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() functions.
Fixes: 2b1c07b918d2 ("batman-adv: tvlv - add distributed arp table container")
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
---
distributed-arp-table.c | 4 ++--
types.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/distributed-arp-table.c b/distributed-arp-table.c
index 0d791dc..b2cc19b 100644
--- a/distributed-arp-table.c
+++ b/distributed-arp-table.c
@@ -682,9 +682,9 @@ static void batadv_dat_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_DAT;
+ clear_bit(BATADV_ORIG_CAPA_HAS_DAT, &orig->capabilities);
else
- orig->capabilities |= BATADV_ORIG_CAPA_HAS_DAT;
+ set_bit(BATADV_ORIG_CAPA_HAS_DAT, &orig->capabilities);
}
/**
diff --git a/types.h b/types.h
index 28f2461..e33b5aa 100644
--- a/types.h
+++ b/types.h
@@ -256,7 +256,7 @@ struct batadv_orig_node {
struct hlist_node mcast_want_all_ipv4_node;
struct hlist_node mcast_want_all_ipv6_node;
#endif
- uint8_t capabilities;
+ unsigned long capabilities;
uint8_t capa_initialized;
atomic_t last_ttvn;
unsigned char *tt_buff;
--
1.7.10.4
next prev parent reply other threads:[~2015-06-16 12:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-16 12:44 [B.A.T.M.A.N.] [PATCHv2 maint 0/5] Fixes for parallel OGM processing Linus Lüssing
2015-06-16 12:44 ` Linus Lüssing [this message]
2015-06-16 12:44 ` [B.A.T.M.A.N.] [PATCHv2 maint 2/5] batman-adv: Make NC capability changes atomic Linus Lüssing
2015-06-16 12:44 ` [B.A.T.M.A.N.] [PATCHv2 maint 3/5] batman-adv: Make TT " Linus Lüssing
2015-06-16 12:44 ` [B.A.T.M.A.N.] [PATCHv2 maint 4/5] batman-adv: Make MCAST " Linus Lüssing
2015-06-16 12:44 ` [B.A.T.M.A.N.] [PATCHv2 maint 5/5] batman-adv: Fix potential synchronization issues in mcast tvlv handler Linus Lüssing
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=1434458675-3343-2-git-send-email-linus.luessing@c0d3.blue \
--to=linus.luessing@c0d3.blue \
--cc=b.a.t.m.a.n@lists.open-mesh.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).