[0/2,net] Bug fixes for batman-adv 2012-06-23
Message ID | 1340465459-2949-1-git-send-email-ordex@autistici.org (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers |
Return-Path: <ordex@autistici.org> Received: from confino.investici.org (investici.nine.ch [217.150.252.179]) by open-mesh.org (Postfix) with ESMTPS id 4EA75600767 for <b.a.t.m.a.n@lists.open-mesh.org>; Sat, 23 Jun 2012 17:31:00 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key; insecure key) header.i=@autistici.org; dkim-adsp=pass Received: from [217.150.252.179] (confino [217.150.252.179]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 8D283C8664; Sat, 23 Jun 2012 15:30:57 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 confino.investici.org 8D283C8664 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1340465458; bh=Hgz9mBYxjLmNkx3ScRoAMIUvPS4+gnsBjtWyGwsl+m8=; h=From:To:Cc:Subject:Date:Message-Id; b=AhMzw56VYLsa25yDVhmQuGKz3bDSrefC2tVzIQP16LQ20KxVyjq2IeDV5ORFcVpVI HEmwgSEm+oArQwy0FPyftFKSBZuQoj+IevO4CsQdJyyoL6wVRtoLsXHJZhUVFLzEbM PvTtHykCyXEIkdsdPx4brD16gSvT6YS0Rw7yHKMw= From: Antonio Quartulli <ordex@autistici.org> To: davem@davemloft.net Date: Sat, 23 Jun 2012 17:30:57 +0200 Message-Id: <1340465459-2949-1-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.9.4 Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: [B.A.T.M.A.N.] [PATCH 0/2 net] Bug fixes for batman-adv 2012-06-23 X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n@lists.open-mesh.org> List-Id: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n.lists.open-mesh.org> List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe> List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n> List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org> List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help> List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe> X-List-Received-Date: Sat, 23 Jun 2012 15:31:00 -0000 |
Pull-request
git://git.open-mesh.org/linux-merge.git batman-adv/maintMessage
Antonio Quartulli
June 23, 2012, 3:30 p.m. UTC
Hello David, here are two fixes intended for net/linux-3.5. Patch 1 is a fix for the AP-Isolation feature. A wrong check made all the broadcast packets coming from any client be dropped before delivery to the interface. Patch 2 instead fixes a "real" race condition in the TranslationTable code. Please, tell me if there is any problem. Thank you, Antonio The following changes since commit a18e08bdcf845efb7344cea146e683df746bbfb4: net: sh_eth: fix the condition to fix the cur_tx/dirty_rx (2012-06-22 21:50:37 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git batman-adv/maint for you to fetch changes up to 8b8e4bc0391f8abbcdb9e1c54415bcc0f4f5a2a0: batman-adv: fix race condition in TT full-table replacement (2012-06-23 17:21:35 +0200) ---------------------------------------------------------------- Included changes: - fix for the AP-isolation feature - fix for a race condition in the TranslationTable code ---------------------------------------------------------------- Antonio Quartulli (1): batman-adv: fix race condition in TT full-table replacement Marek Lindner (1): batman-adv: only drop packets of known wifi clients net/batman-adv/translation-table.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
Comments
On Sat, Jun 23, 2012 at 05:30:57 +0200, Antonio Quartulli wrote: > Hello David, > > here are two fixes intended for net/linux-3.5. > > Patch 1 is a fix for the AP-Isolation feature. A wrong check made all the > broadcast packets coming from any client be dropped before delivery to the > interface. > Patch 2 instead fixes a "real" race condition in the TranslationTable code. > > Please, tell me if there is any problem. > Thank you, > Antonio > > > > The following changes since commit a18e08bdcf845efb7344cea146e683df746bbfb4: > > net: sh_eth: fix the condition to fix the cur_tx/dirty_rx (2012-06-22 21:50:37 -0700) > > are available in the git repository at: > > git://git.open-mesh.org/linux-merge.git batman-adv/maint > > for you to fetch changes up to 8b8e4bc0391f8abbcdb9e1c54415bcc0f4f5a2a0: > > batman-adv: fix race condition in TT full-table replacement (2012-06-23 17:21:35 +0200) > Hello David, after pulling these patchset in net, you should hit a conflict while trying to merge net into net-next. The conflict is caused by the renaming patches that you already have in the next tree. Here are our instructions about how to solve it. Hope they will help. Thank you. Conflict 1: <<<<<<< orig_entry = container_of(rcu, struct batadv_tt_orig_list_entry, rcu); atomic_dec(&orig_entry->orig_node->tt_size); batadv_orig_node_free_ref(orig_entry->orig_node); ======= orig_entry = container_of(rcu, struct tt_orig_list_entry, rcu); orig_node_free_ref(orig_entry->orig_node); >>>>>>> Resolves to: ======= orig_entry = container_of(rcu, struct batadv_tt_orig_list_entry, rcu); batadv_orig_node_free_ref(orig_entry->orig_node); ======= Conflict 2: <<<<<<< call_rcu(&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu); ======= /* to avoid race conditions, immediately decrease the tt counter */ atomic_dec(&orig_entry->orig_node->tt_size); call_rcu(&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu); >>>>>>> Resolves to: ======= /* to avoid race conditions, immediately decrease the tt counter */ atomic_dec(&orig_entry->orig_node->tt_size); call_rcu(&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu); ======= Conflict 3: <<<<<<< struct batadv_tt_local_entry *tt_local_entry = NULL; struct batadv_tt_global_entry *tt_global_entry = NULL; bool ret = true; ======= struct tt_local_entry *tt_local_entry = NULL; struct tt_global_entry *tt_global_entry = NULL; bool ret = false; >>>>>>> Resolves to: ======= struct batadv_tt_local_entry *tt_local_entry = NULL; struct batadv_tt_global_entry *tt_global_entry = NULL; bool ret = false; ======= Conflict 4: <<<<<<< if (_batadv_is_ap_isolated(tt_local_entry, tt_global_entry)) ======= if (!_is_ap_isolated(tt_local_entry, tt_global_entry)) >>>>>>> Resolves to: ======= if (!_batadv_is_ap_isolated(tt_local_entry, tt_global_entry)) =======
From: Antonio Quartulli <ordex@autistici.org> Date: Sat, 23 Jun 2012 17:30:57 +0200 > Patch 1 is a fix for the AP-Isolation feature. A wrong check made all the > broadcast packets coming from any client be dropped before delivery to the > interface. > Patch 2 instead fixes a "real" race condition in the TranslationTable code. ... > git://git.open-mesh.org/linux-merge.git batman-adv/maint Pulled, thanks.
From: Antonio Quartulli <ordex@autistici.org> Date: Sat, 23 Jun 2012 17:45:12 +0200 > after pulling these patchset in net, you should hit a conflict while trying to > merge net into net-next. The conflict is caused by the renaming patches that you > already have in the next tree. > > Here are our instructions about how to solve it. Hope they will help. Thanks a lot for this.