lkml.org 
[lkml]   [2020]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 78/93] batman-adv: Prevent duplicated global TT entry
    Date
    From: Sven Eckelmann <sven@narfation.org>

    commit e7136e48ffdfb9f37b0820f619380485eb407361 upstream.

    The function batadv_tt_global_orig_entry_add is responsible for adding new
    tt_orig_list_entry to the orig_list. It first checks whether the entry
    already is in the list or not. If it is, then the creation of a new entry
    is aborted.

    But the lock for the list is only held when the list is really modified.
    This could lead to duplicated entries because another context could create
    an entry with the same key between the check and the list manipulation.

    The check and the manipulation of the list must therefore be in the same
    locked code section.

    Fixes: d657e621a0f5 ("batman-adv: add reference counting for type batadv_tt_orig_list_entry")
    Signed-off-by: Sven Eckelmann <sven@narfation.org>
    Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/batman-adv/translation-table.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/net/batman-adv/translation-table.c
    +++ b/net/batman-adv/translation-table.c
    @@ -1315,6 +1315,8 @@ batadv_tt_global_orig_entry_add(struct b
    {
    struct batadv_tt_orig_list_entry *orig_entry;

    + spin_lock_bh(&tt_global->list_lock);
    +
    orig_entry = batadv_tt_global_orig_entry_find(tt_global, orig_node);
    if (orig_entry) {
    /* refresh the ttvn: the current value could be a bogus one that
    @@ -1337,10 +1339,8 @@ batadv_tt_global_orig_entry_add(struct b
    orig_entry->flags = flags;
    atomic_set(&orig_entry->refcount, 2);

    - spin_lock_bh(&tt_global->list_lock);
    hlist_add_head_rcu(&orig_entry->list,
    &tt_global->orig_list);
    - spin_unlock_bh(&tt_global->list_lock);
    atomic_inc(&tt_global->orig_list_count);

    sync_flags:
    @@ -1348,6 +1348,8 @@ sync_flags:
    out:
    if (orig_entry)
    batadv_tt_orig_list_entry_free_ref(orig_entry);
    +
    + spin_unlock_bh(&tt_global->list_lock);
    }

    /**

    \
     
     \ /
      Last update: 2020-03-19 14:37    [W:4.935 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site