commits May 2014

commits@lists.open-mesh.org

1 participants
88 discussions

[batman-adv] next: Merge branch 'maint' into next (5b3eab9)
by postmaster＠open-mesh.org 15 May '14

15 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 5b3eab94367eb94b8cff8af053e3c7465374a818 Merge: a1b1426 b539153 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri May 16 02:57:27 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 5b3eab94367eb94b8cff8af053e3c7465374a818 soft-interface.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

1 0

[batman-adv] maint: batman-adv: fix var name to keep compatibility with old kernels (b539153)
by postmaster＠open-mesh.org 15 May '14

15 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit b53915310227cc9b029ba0fa5aae44e50a461f80 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Thu May 15 11:08:07 2014 +0200 batman-adv: fix var name to keep compatibility with old kernels The first argument of kfree_rcu() is used in compat.h to forge a function name used by old kernels. Keep it as it was before to avoid breaking this compat mechanism. Introduced by 9729d2085c0fa4398eb1ee518b0097866dfdcd77 ("batman-adv: fix TT VLAN inconsistency on VLAN re-add") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- b53915310227cc9b029ba0fa5aae44e50a461f80 soft-interface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index 82804e7..a4e6e5e 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -437,14 +437,14 @@ out: * possibly free it * @softif_vlan: the vlan object to release */ -void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan) +void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan) { - if (atomic_dec_and_test(&vlan->refcount)) { - spin_lock_bh(&vlan->bat_priv->softif_vlan_list_lock); - hlist_del_rcu(&vlan->list); - spin_unlock_bh(&vlan->bat_priv->softif_vlan_list_lock); + if (atomic_dec_and_test(&softif_vlan->refcount)) { + spin_lock_bh(&softif_vlan->bat_priv->softif_vlan_list_lock); + hlist_del_rcu(&softif_vlan->list); + spin_unlock_bh(&softif_vlan->bat_priv->softif_vlan_list_lock); - kfree_rcu(vlan, rcu); + kfree_rcu(softif_vlan, rcu); } }

1 0

[batman-adv] maint: batman-adv: fix alignment (bc089ef)
by postmaster＠open-mesh.org 15 May '14

15 May '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit bc089ef4b36b6633cf38a6a4fa4bea9ff2b2965d Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Thu May 15 11:08:06 2014 +0200 batman-adv: fix alignment Introduced by 9729d2085c0fa4398eb1ee518b0097866dfdcd77 ("batman-adv: fix TT VLAN inconsistency on VLAN re-add") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- bc089ef4b36b6633cf38a6a4fa4bea9ff2b2965d soft-interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index 5a9dc2f..82804e7 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -594,8 +594,8 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto, * exists, because the entry was deleted by kill_vid() */ batadv_tt_local_add(bat_priv->soft_iface, - bat_priv->soft_iface->dev_addr, vid, - BATADV_NULL_IFINDEX, BATADV_NO_MARK); + bat_priv->soft_iface->dev_addr, vid, + BATADV_NULL_IFINDEX, BATADV_NO_MARK); return 0; }

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 15 May '14

15 May '14

The annotated tag, batman-adv-fix-for-davem has been updated to 71fbcbdf2a0ae775ee2110d57b33a823755d727a (tag) from 106dc59d7e78aa1c5d640ba3a11372eeed9b60e7 (which is now obsolete) tagging cc2f33860cea0e48ebec096130bd0f7c4bf6e0bc (commit) replaces v3.15-rc4 tagged by Antonio Quartulli on Thu May 15 20:38:12 2014 +0200 - Shortlog ------------------------------------------------------------ Include changes: - fix NULL dereference in batadv_orig_hardif_seq_print_text() - fix reference counting imbalance when using fragmentation - avoid access to orig_node objects after they have been free'd - fix local TT check for outgoing arp requests in DAT -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTdQmwAAoJEEKTMo6mOh1VGLAP/A1nHDzPMUOcDttR49Cs38w0 oD2Ox66xSJh2Yn8qRg9k7CshG65pU70J77bQjkPvMtTlwsgwgLFcHP1b/RJQl7Cz aFSJY5tKvLL41TwqxLSAmvUyPMfvagXvxH65bLBIQ9+dLNkDiHNH/IjdnYKWHYi9 0tqUi7/pLaCfWXMkDVeWn0P2M8baDyU1HUTuRX3ctE4l9PKF9ZVgxsxaPrhTYlXY J61KT+VXs19rdAnYQlFiaDk64Q6meMjuNjxuLkViTmqKi6pSDGi9skeKWZXaKOjT UmLLygVyf9Sh36TWDKinSV09r/s+TeU35o6bCgrmshZebSmFEUkEDA7oxNJ5JW+Q Lh2Y2SrX/+F0+9yhxhDd0fHP3PAwt2XNKjIQjurE85Gw84ZoMyBsVIpF8LD3IS+I T5CSAB0fEyeS0ZFyChbgWSLZzFjcowRHwK1iO8SJC5LHRtYerEqnvgP/V3ej0dt9 A4nq8eO8N9AorQc1G9qMosLNLheMCmFenU2nb8MbC5yDvq2X9jxsmgYm0fvr/y47 f667bowPr0afhsLvTqy6ezYma9EV40F8jW2/OovyBRUuytavJ4xcbCz/FUlWfNRU xx68e15t49iOFJynGXt62LJnEmBzRaE2uUagZaMNms18gmsL10y5pECAmi9zhQWK smkfqmsVWU8nB9UsDIT7 =+DKS -----END PGP SIGNATURE----- Antonio Quartulli (3): batman-adv: fix reference counting imbalance while sending fragment batman-adv: increase orig refcount when storing ref in gw_node batman-adv: fix local TT check for outgoing arp requests in DAT Marek Lindner (1): batman-adv: fix indirect hard_iface NULL dereference Simon Wunderlich (4): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors batman-adv: fix removing neigh_ifinfo ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 15 May '14

15 May '14

The annotated tag, batman-adv-fix-for-davem has been updated to 106dc59d7e78aa1c5d640ba3a11372eeed9b60e7 (tag) from ee95f098f3a927a3e51803733404832241a94119 (which is now obsolete) tagging cc2f33860cea0e48ebec096130bd0f7c4bf6e0bc (commit) replaces v3.15-rc4 tagged by Antonio Quartulli on Thu May 15 20:30:01 2014 +0200 - Shortlog ------------------------------------------------------------ Include changes: - fix NULL dereference in batadv_orig_hardif_seq_print_text() - fix reference counting imbalance when using fragmentation - avoid access to gw_node after free - fix local TT check for outgoing arp requests in DAT -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTdQezAAoJEEKTMo6mOh1Vt14P/RjRiiWtHqiJRjcwvoZR/MlR GHTEulSZdDDXNcgShN5ly5puyPVlitqTJhWX/vGX0lnnR+lkYvecX7EDSF3yPhfx IxdlkQKXyc8rQbbFnQa9ccHHitEIZ48QK8HGnt6mk0EZU37Hl5GS41FJJqfZXT99 30qFYvBZsLecAjoVGVgk9ZWbGgBWnuVgamGhgFUehEJNf6xsxjNZzAKKWzehUNEt WML2q1PUbxYMH255ISxye9kq75MJ3Bgxu0k4zrRXCVP7qphgYyZCHhBTxyBNNFWZ lImF8bgKAxm3/i5MfgvTjsYVdRHtnOpkkia94cNpKFU+R8K4yBz8b7QY1QSxw8qC YasK3X7J3pV9J/fUpLEUI9rWuSFZNRNIQkqEzwk3EvKuAnsiDKOK1NB5zp5myhQE F2RiSXbxA0+aH+unf90aro178V/iE+KUKz8Bq3plZKANpFNUoM4SbzW2b4pYj4aw 9ZrSLLqiirsj6/hKzi/GYPOh4eu+7wG/WnakPL9rYty5q3ZBTawwTYWofMaQCJ84 8oEf/evkNsDvaQbxQiYv5GKrzqsTdoDZdnwq43FtGScVadKGWs0Es3xS8Fi5bnrH kmS0AO6N/jrE0pXiddjZ62DArW+rY2gDAz3vj2ea/bwynOXKcdj3BNJHLLLMbXD+ Caoc2aKx63/u3giBfaRR =+MYJ -----END PGP SIGNATURE----- Antonio Quartulli (3): batman-adv: fix reference counting imbalance while sending fragment batman-adv: increase orig refcount when storing ref in gw_node batman-adv: fix local TT check for outgoing arp requests in DAT Marek Lindner (1): batman-adv: fix indirect hard_iface NULL dereference Simon Wunderlich (4): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors batman-adv: fix removing neigh_ifinfo ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 15 May '14

15 May '14

The annotated tag, batman-adv-fix-for-davem has been updated to ee95f098f3a927a3e51803733404832241a94119 (tag) from 025854c9ae89938bfdd739ae0be73bc4a928a534 (which is now obsolete) tagging cc2f33860cea0e48ebec096130bd0f7c4bf6e0bc (commit) replaces v3.15-rc4 tagged by Antonio Quartulli on Thu May 15 20:25:00 2014 +0200 - Shortlog ------------------------------------------------------------ Include changes: - fix NULL reference in batadv_orig_hardif_seq_print_text() - fix reference counting imbalance when using fragmentation - avoid access to gw_node after free - fix local TT check for outgoing arp requests in DAT -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTdQaBAAoJEEKTMo6mOh1V3FEP/j8etYW66zHUHtFaq9/uUUIk EYDk/RLL6rtaSO5kEsKvX3F9tHhGZZowKcIpTIHHOc0CeaZtKA1syjVksDolA4wB VyGPOY3KS7VfP/aFIx7wfmtWWU5JzcVzd/H1V+YBkS0k7jaNakALkuZJYLvaiB71 nGoRQ93QfQpaQjx1gsWATgkFYmT7iUlln04PJfcOV+Xvn9aOj/c87tB5svEm2PH7 dXrFmukp7/aQeItHHh0BEeU+Y3nF4GOEdIXgm86NTC+6c4UPtTLIJwtXvnXwwXlE T+lIgF0H9k0+5Raz5GpMj0tWfXPOK/saQlLfCKWUGBwWP8G2FxeHfDv2XcseW4Ei yFmS2QBhbs4eeDhddF+YWb24EC59Q9og73fhBFcmuCxSiZlTQXjcThMTAMYeBDZx 6JOUf27AXcFlYjZD67QEjMWt5XS5V3QP8vKGNm5u0JAUim4+4iQjTYXgaRWtBu1y ymyMz5VoGelk9L0Tb09SzapyqMaLPJjOrR7KeMkzdcoRuSpgm5ibI2jWE+kztaEP l0RroDNzWh2QmRPDiGBUB89ftOg9TP5N2DJILpVTLqbfTTyyDsJQwSYMbyfNxCxc vQiS+XxwCRlaYCAlG5wyYdczMNbd89Z9f80KmNNV1OReBL53aZ+j3Kj7k4c3z5HA durZMN+mwGB9aUbOgJ4l =yzdj -----END PGP SIGNATURE----- Antonio Quartulli (3): batman-adv: fix reference counting imbalance while sending fragment batman-adv: increase orig refcount when storing ref in gw_node batman-adv: fix local TT check for outgoing arp requests in DAT Marek Lindner (1): batman-adv: fix indirect hard_iface NULL dereference Simon Wunderlich (4): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors batman-adv: fix removing neigh_ifinfo ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 15 May '14

15 May '14

The annotated tag, batman-adv-fix-for-davem has been updated to 025854c9ae89938bfdd739ae0be73bc4a928a534 (tag) from 1e0e4c1114e90864d75f3696aac52ba38b4cfedf (which is now obsolete) tagging add280efed0dd57b1cec4e723bd32685dff47f36 (commit) replaces v3.15-rc4 tagged by Antonio Quartulli on Thu May 15 20:21:32 2014 +0200 - Shortlog ------------------------------------------------------------ Include changes: - fix NULL reference in batadv_orig_hardif_seq_print_text() - fix reference counting imbalance when using fragmentation - avoid access to gw_node after free - fix local TT check for outgoing arp requests in DAT -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTdQWxAAoJEEKTMo6mOh1V+2AP/RNugZB/5NLGnVT74pu4zFv+ Qs6vVJ77u8LwiLH/4hQEG2yaZmBxGioNOYUTnkWglO86S+v1HgVkz1AsYFIs0qaq WtWAQuJ71KZ11Okb6+FG0TcN6viEqHohtCensK6XWaCWJfai7ffyntorBfAKDbI3 +nsw1DlryHDugJnNRom594YQ/8/cF04OzxnxG7WJiAaWvr+Ki2dWVVkGExbif6qP 4i7kCzHnKDVs1JXK9/J5Cr52sVmPE+MZpfA4eQY9VZYNAozhDxXjEKExeoIfE54L 8MPJCqiqVZm8MFA2Cy37IKGMlZP7jT8txg4PaDwD7UppvHhloeOzitEBA5r6KLSY s3h0Tv1ZPPsdwTfX3Ll4M084oMW9vmAePIW41gCQVo0hcFQmSsDLG/+sxkI7buvp ilNfQ+u3nhYaZDJImCzeEwA6lAEYpkNo/Idgb8dJuQMe8r9D9i50Vuz7312yBFjE a0iMKpKyGFn4VlWdFOPj15fElprlAGqukzVGT36ulyOGQi8TtYIkgQjxP55lAG+t c+bzxiOywiZ8G1IvrmGuKgxL50SfsKtCpGR9ia5Ak9YNYmJ6G6tlXzYlfHV5ns70 v9zDVrLchAfZdEskMuCXU8vN5MG7nLRFMMnuNXDMDSzdeOwGyIAm5e+vMfQQzvkb Wpqhe/jGVCkR9HGZM/V9 =OQgL -----END PGP SIGNATURE----- Antonio Quartulli (3): batman-adv: fix reference counting imbalance while sending fragment batman-adv: increase orig refcount when storing ref in gw_node batman-adv: fix local TT check for outgoing arp requests in DAT Marek Lindner (1): batman-adv: fix indirect hard_iface NULL dereference Simon Wunderlich (4): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors batman-adv: fix removing neigh_ifinfo ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v3.14-rc1-2135-g0a1689d
by postmaster＠open-mesh.org 15 May '14

15 May '14

The following commit has been merged in the merge/master branch: commit 0a1689da7bfc32d9f6caa581af41b560fd1e164f Merge: ac44ee35fb889d6348f5b51cc832d906810c2453 a1b142620c8dad5e75fbb615925fb76846b5d45d Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Thu May 15 19:14:55 2014 +0200 Merge commit 'a1b142620c8dad5e75fbb615925fb76846b5d45d' into merge/master diff --combined net/batman-adv/originator.c index bb1425f,6a48451..6a48451 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@@ -709,7 -709,7 +709,7 @@@ free_orig_node /** * batadv_purge_neigh_ifinfo - purge obsolete ifinfo entries from neighbor * @bat_priv: the bat priv with all the soft interface information - * @neigh_node: orig node which is to be checked + * @neigh: orig node which is to be checked */ static void batadv_purge_neigh_ifinfo(struct batadv_priv *bat_priv, @@@ -847,8 -847,8 +847,8 @@@ batadv_purge_orig_neighbors(struct bata hlist_del_rcu(&neigh_node->list); batadv_neigh_node_free_ref(neigh_node); } else { - /* only neccesary if not the whole neighbor is to be deleted, - * but some interface has been removed. + /* only necessary if not the whole neighbor is to be + * deleted, but some interface has been removed. */ batadv_purge_neigh_ifinfo(bat_priv, neigh_node); } diff --combined net/batman-adv/soft-interface.c index 9f070de,a827921..a827921 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -454,10 -454,15 +454,15 @@@ out * possibly free it * @softif_vlan: the vlan object to release */ - void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan) + void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan) { - if (atomic_dec_and_test(&softif_vlan->refcount)) - kfree_rcu(softif_vlan, rcu); + if (atomic_dec_and_test(&vlan->refcount)) { + spin_lock_bh(&vlan->bat_priv->softif_vlan_list_lock); + hlist_del_rcu(&vlan->list); + spin_unlock_bh(&vlan->bat_priv->softif_vlan_list_lock); + + kfree_rcu(vlan, rcu); + } } /** @@@ -511,6 -516,7 +516,7 @@@ int batadv_softif_create_vlan(struct ba if (!vlan) return -ENOMEM; + vlan->bat_priv = bat_priv; vlan->vid = vid; atomic_set(&vlan->refcount, 1); @@@ -522,6 -528,10 +528,10 @@@ return err; } + spin_lock_bh(&bat_priv->softif_vlan_list_lock); + hlist_add_head_rcu(&vlan->list, &bat_priv->softif_vlan_list); + spin_unlock_bh(&bat_priv->softif_vlan_list_lock); + /* add a new TT local entry. This one will be marked with the NOPURGE * flag */ @@@ -529,10 -539,6 +539,6 @@@ bat_priv->soft_iface->dev_addr, vid, BATADV_NULL_IFINDEX, BATADV_NO_MARK); - spin_lock_bh(&bat_priv->softif_vlan_list_lock); - hlist_add_head_rcu(&vlan->list, &bat_priv->softif_vlan_list); - spin_unlock_bh(&bat_priv->softif_vlan_list_lock); - return 0; } @@@ -544,18 -550,13 +550,13 @@@ static void batadv_softif_destroy_vlan(struct batadv_priv *bat_priv, struct batadv_softif_vlan *vlan) { - spin_lock_bh(&bat_priv->softif_vlan_list_lock); - hlist_del_rcu(&vlan->list); - spin_unlock_bh(&bat_priv->softif_vlan_list_lock); - - batadv_sysfs_del_vlan(bat_priv, vlan); - /* explicitly remove the associated TT local entry because it is marked * with the NOPURGE flag */ batadv_tt_local_remove(bat_priv, bat_priv->soft_iface->dev_addr, vlan->vid, "vlan interface destroyed", false); + batadv_sysfs_del_vlan(bat_priv, vlan); batadv_softif_vlan_free_ref(vlan); } @@@ -573,6 -574,8 +574,8 @@@ static int batadv_interface_add_vid(str unsigned short vid) { struct batadv_priv *bat_priv = netdev_priv(dev); + struct batadv_softif_vlan *vlan; + int ret; /* only 802.1Q vlans are supported. * batman-adv does not know how to handle other types @@@ -582,7 -585,36 +585,36 @@@ vid |= BATADV_VLAN_HAS_TAG; - return batadv_softif_create_vlan(bat_priv, vid); + /* if a new vlan is getting created and it already exists, it means that + * it was not deleted yet. batadv_softif_vlan_get() increases the + * refcount in order to revive the object. + * + * if it does not exist then create it. + */ + vlan = batadv_softif_vlan_get(bat_priv, vid); + if (!vlan) + return batadv_softif_create_vlan(bat_priv, vid); + + /* recreate the sysfs object if it was already destroyed (and it should + * be since we received a kill_vid() for this vlan + */ + if (!vlan->kobj) { + ret = batadv_sysfs_add_vlan(bat_priv->soft_iface, vlan); + if (ret) { + batadv_softif_vlan_free_ref(vlan); + return ret; + } + } + + /* add a new TT local entry. This one will be marked with the NOPURGE + * flag. This must be added again, even if the vlan object already + * exists, because the entry was deleted by kill_vid() + */ + batadv_tt_local_add(bat_priv->soft_iface, + bat_priv->soft_iface->dev_addr, vid, + BATADV_NULL_IFINDEX, BATADV_NO_MARK); + + return 0; } /** diff --combined net/batman-adv/translation-table.c index d636bde,5f59e7f..5f59e7f --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -511,6 -511,7 +511,7 @@@ bool batadv_tt_local_add(struct net_dev struct batadv_priv *bat_priv = netdev_priv(soft_iface); struct batadv_tt_local_entry *tt_local; struct batadv_tt_global_entry *tt_global = NULL; + struct batadv_softif_vlan *vlan; struct net_device *in_dev = NULL; struct hlist_head *head; struct batadv_tt_orig_list_entry *orig_entry; @@@ -572,6 -573,9 +573,9 @@@ if (!tt_local) goto out; + /* increase the refcounter of the related vlan */ + vlan = batadv_softif_vlan_get(bat_priv, vid); + batadv_dbg(BATADV_DBG_TT, bat_priv, "Creating new local tt entry: %pM (vid: %d, ttvn: %d)\n", addr, BATADV_PRINT_VID(vid), @@@ -604,6 -608,7 +608,7 @@@ if (unlikely(hash_added != 0)) { /* remove the reference for the hash */ batadv_tt_local_entry_free_ref(tt_local); + batadv_softif_vlan_free_ref(vlan); goto out; } @@@ -1009,6 -1014,7 +1014,7 @@@ uint16_t batadv_tt_local_remove(struct { struct batadv_tt_local_entry *tt_local_entry; uint16_t flags, curr_flags = BATADV_NO_FLAGS; + struct batadv_softif_vlan *vlan; tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid); if (!tt_local_entry) @@@ -1039,6 -1045,11 +1045,11 @@@ hlist_del_rcu(&tt_local_entry->common.hash_entry); batadv_tt_local_entry_free_ref(tt_local_entry); + /* decrease the reference held for this vlan */ + vlan = batadv_softif_vlan_get(bat_priv, vid); + batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_free_ref(vlan); + out: if (tt_local_entry) batadv_tt_local_entry_free_ref(tt_local_entry); @@@ -1111,6 -1122,7 +1122,7 @@@ static void batadv_tt_local_table_free( spinlock_t *list_lock; /* protects write access to the hash lists */ struct batadv_tt_common_entry *tt_common_entry; struct batadv_tt_local_entry *tt_local; + struct batadv_softif_vlan *vlan; struct hlist_node *node_tmp; struct hlist_head *head; uint32_t i; @@@ -1131,6 -1143,13 +1143,13 @@@ tt_local = container_of(tt_common_entry, struct batadv_tt_local_entry, common); + + /* decrease the reference held for this vlan */ + vlan = batadv_softif_vlan_get(bat_priv, + tt_common_entry->vid); + batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_free_ref(vlan); + batadv_tt_local_entry_free_ref(tt_local); } spin_unlock_bh(list_lock); @@@ -3139,6 -3158,7 +3158,7 @@@ static void batadv_tt_local_purge_pendi struct batadv_hashtable *hash = bat_priv->tt.local_hash; struct batadv_tt_common_entry *tt_common; struct batadv_tt_local_entry *tt_local; + struct batadv_softif_vlan *vlan; struct hlist_node *node_tmp; struct hlist_head *head; spinlock_t *list_lock; /* protects write access to the hash lists */ @@@ -3167,6 -3187,12 +3187,12 @@@ tt_local = container_of(tt_common, struct batadv_tt_local_entry, common); + + /* decrease the reference held for this vlan */ + vlan = batadv_softif_vlan_get(bat_priv, tt_common->vid); + batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_free_ref(vlan); + batadv_tt_local_entry_free_ref(tt_local); } spin_unlock_bh(list_lock); diff --combined net/batman-adv/types.h index 34891a5,8854c05..8854c05 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@@ -687,6 -687,7 +687,7 @@@ struct batadv_priv_nc /** * struct batadv_softif_vlan - per VLAN attributes set + * @bat_priv: pointer to the mesh object * @vid: VLAN identifier * @kobj: kobject for sysfs vlan subdirectory * @ap_isolation: AP isolation state @@@ -696,6 -697,7 +697,7 @@@ * @rcu: struct used for freeing in a RCU-safe manner */ struct batadv_softif_vlan { + struct batadv_priv *bat_priv; unsigned short vid; struct kobject *kobj; atomic_t ap_isolation; /* boolean */ -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 15 May '14

15 May '14

The annotated tag, batman-adv-fix-for-davem has been updated to 1e0e4c1114e90864d75f3696aac52ba38b4cfedf (tag) from 2250ac0703771bc1d30ad673c8f83aac8b6b749e (which is now obsolete) tagging 92af9c303ec7e81f164832358706435b8241fe10 (commit) replaces v3.15-rc4 tagged by Antonio Quartulli on Thu May 15 20:09:20 2014 +0200 - Shortlog ------------------------------------------------------------ Include changes: - fix NULL reference in batadv_orig_hardif_seq_print_text() - fix reference counting imbalance when using fragmentation - avoid access to gw_node after free - fix local TT check for outgoing arp requests in DAT -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTdQSzAAoJEEKTMo6mOh1VAZUP/0x7xfosSaMGUw5KXclKsiCu kbswcP1h8MSkGX/nypp47Y1FI5KK/Hs2oLeYluMR4fADE6BhzOwcTpPwBqFtRexy rWapqXgZIqgkpN3RJiC1rlO3id0QcTufXleq4PWGXwHmN+2qvocdaeSn+ZT/PJy8 sqvM4sWbDLQrLk+xnaVwtZm1JkvO+hKyrZGrWetLj02Cp7nipDqrzHXhNBxAYjtT m0oFCrOxqswCK9yonh9dzbdBD2wWMYWBKDxIryJO5++o2YD1H3tnYpJ/kw7hL9Yy G9ilCcLr5+gn///IgfKGYlf3KMvdOfa/DpCYvLRypCh8ErzqS+O+Puy+XKLIiyBl kGR9+KGeejFPzYvTIppBzoqUb25AhiA/66e5P60U8yH1RG2vRVIPCrIH7sNcHLOP krpE5j0AVVf9iQNuF4mB9rmTL+PCpyNd2TTNG3nKZ4CS/2QKTGlcLd2uqoHFdjGg 4n0s+cGqmTP+cEcsKKONQzrIFx3I49wb8xSFe40g95lpfUz74sLIjk5Y0pT7qEVr G6i9j5WrtHzxSNSjSuBXNhkNsTlXmhzvs85S3HbrxPiVx+qC23ucAIXTxkKTv6mn O2J91UCIhHJyqlCy+RxHUYQYZugF87MBpwJxFMCngc2+PngTC8U3VXUfkMaqB8Nj EP7klE3SfBwEx77J1ndH =kDqI -----END PGP SIGNATURE----- Antonio Quartulli (5): batman-adv: fix reference counting imbalance while sending fragment batman-adv: increase orig refcount when storing ref in gw_node batman-adv: fix local TT check for outgoing arp requests in DAT batman-adv: change the MAC of each VLAN upon ndo_set_mac_address batman-adv: fix TT VLAN inconsistency on VLAN re-add Marek Lindner (2): batman-adv: fix indirect hard_iface NULL dereference batman-adv: fix NULL pointer dereferences Simon Wunderlich (4): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors batman-adv: fix removing neigh_ifinfo ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master's head updated: Merge branch 'next' (cf7a3b7)
by postmaster＠open-mesh.org 14 May '14

14 May '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 236e603 batman-adv: fix typ0 in kerneldoc and comment a1b1426 Merge branch 'maint' into next cf7a3b7 Merge branch 'next'

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2014