[linux-merge]linux integration; annotated tag, v3.13-rc6, created. v3.13-rc6
by postmaster＠open-mesh.org
The annotated tag, v3.13-rc6 has been created
at 13ecbebf2553bb6c5f19457e78a6c8f2a1732151 (tag)
tagging 802eee95bde72fd0cd0f3a5b2098375a487d1eda (commit)
replaces v3.13-rc5
tagged by Linus Torvalds
on Sun Dec 29 16:01:44 2013 -0800
- Shortlog ------------------------------------------------------------
Linux 3.13-rc6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJSwLfoAAoJEHm+PkMAQRiGi6QH/1U1B7lmHChDTw3jj1lfm9gA
189Si4QJlnxFWCKHvKEL+pcaVuACU+aMGI8+KyMYK4/JfuWVjjj5fr/SvyHH2/8m
LdSK8aHMhJ46uBS4WJ/l6v46qQa5e2vn8RKSBAyKm/h4vpt+hd6zJdoFrFai4th7
k/TAwOAEHI5uzexUChwLlUBRTvbq4U8QUvDu+DeifC8cT63CGaaJ4qVzjOZrx1an
eP6UXZrKDASZs7RU950i7xnFVDQu4PsjlZi25udsbeiKcZJgPqGgXz5ULf8ZH8RQ
YCi1JOnTJRGGjyIOyLj7pyB01h7XiSM2+eMQ0S7g54F2s7gCJ58c2UwQX45vRWU=
=/4/R
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
9 years, 1 month
[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org
The annotated tag, batman-adv-fix-for-davem has been updated
to b1e32b6e0b1e73354fe33fedc15701a2e34c20f1 (tag)
from 1596a2c690161416bf47e8f1fd19f886bff76026 (which is now obsolete)
tagging 2b1e2cb3594df80446dc33bb8e12230da11f38ff (commit)
replaces v3.13-rc4
tagged by Antonio Quartulli
on Sat Dec 28 16:56:53 2013 +0100
- Shortlog ------------------------------------------------------------
Included changes:
- reset netfilter-bridge state when removing the batman-adv
header from an incoming packet. This prevents netfilter
bridge from being fooled when the same packet enters a
bridge twice (or more): the first time within the
batman-adv header and the second time without.
- adjust the packet layout to prevent any architecture from
adding padding bytes. All the structs sent over the wire
now have size multiple of 4bytes (unless pack(2) is used).
- fix access to the inner vlan_eth header when reading the
VID in the rx path.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAABCAAGBQJSvvT6AAoJEEKTMo6mOh1Vn4EP+gKxohskmxmnRd/MnOL1FyyR
+T1+RtNm3Z2+v0OlR1zcHS5MJwt7KDrakS+w4tJTNiZTaPPjHQZu9wAn4wlFt9ix
9GO9nAtTbOcPj72WZsmq3Wslm2qKnF+kmu7hdOu7Grv3n3EEafQ+P8vzw7FACB+N
dMiwkfGdHgSxlM7a1faJM9N2qiSM2vUesElYPyinhjCciHwBuFW3HwK3CxayVwVE
Q20AMlgUd18ZGgy5oqrZz/1LCpaOsydtbcNHOXjF8gX0zwCTmog9GTAD6hT0mtTU
8lo2DHLFH9Hxm1bs8jDkiQEBLK2gXPGb6ic07IRE6g24my62RrAizE/yMmd1WrCP
6I8Qhs58tQ0RUVH8m6XG71TBw3nLk69QbKxHbYiDWlLQhrygx/9+ZXfuu3VUPvGS
9EmNuWw3Io7+KqaT0BJC6CJIkZLTL7oJvgyO2uFGEgkSjY5vxSF8GU0yisP9xilW
bpfhQO64gsmxjY2tjmIVRckVTUOsMnJKVlquq6aHKfgsOQdnTTNOd+l7bD8izIJ8
GwZKZLuzYJqYop4TxpkbNK2ckCl0kcMCHHLInJ/pO1KU0sAs+V1+HHouX6VGr9HT
IsbBvwMslbRPi8uOFAzueHTT/DzBXdP4sMsg5QomBQOqH8LlZuQ4ZBHtUbEQOVrp
xRCy3Fj/wjWzZUFdYE3f
=RDuB
-----END PGP SIGNATURE-----
Antonio Quartulli (4):
batman-adv: fix size of batadv_icmp_header
batman-adv: fix alignment for batadv_tvlv_tt_change
batman-adv: clean nf state when removing protocol header
batman-adv: fix vlan header access
Simon Wunderlich (3):
batman-adv: fix alignment for batadv_coded_packet
batman-adv: fix header alignment by unrolling batadv_header
batman-adv: fix size of batadv_bla_claim_dst
-----------------------------------------------------------------------
--
linux integration
9 years, 1 month
[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org
The annotated tag, batman-adv-fix-for-davem has been updated
to 1596a2c690161416bf47e8f1fd19f886bff76026 (tag)
from c8c96e19a066e131816aa1ef806e5ba75b129146 (which is now obsolete)
tagging 2b1e2cb3594df80446dc33bb8e12230da11f38ff (commit)
replaces v3.13-rc4
tagged by Antonio Quartulli
on Sat Dec 28 15:17:09 2013 +0100
- Shortlog ------------------------------------------------------------
Included changes:
- reset netfilter-bridge state when removing the batman-adv
header from an incoming packet. This prevents netfilter
bridge from being fooled when the same packet enters a
bridge twice (or more): the first time within the
batman-adv header and the second time without.
- adjust the packet layout to prevent any architecture from
adding padding bytes. All the structs sent over the wire
now have size multiple of 4bytes (unless pack(2) is used).
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAABCAAGBQJSvt2OAAoJEEKTMo6mOh1VomgP/2m7S1Aeb3ed1rLUzRUz0Fuq
JOAm6ptb0GiLMgY+UtaG5WP9ZDthMAz/G55A9jd8Q+2XZPaZWmXkwueO9gID7pic
wpFtAsG5GXA5QdUD7cXooYKRypYnhzjocM3YY6Qyl1gmbGw/L0tbkEPppILXcM1+
VN3A1cJPDIL1Sl6whzBzI+DQe5a1TXPxU0QBmsEjg4kXrr0SAMDL7/iCWR2RF+O+
d8cv5L+sTL+KJ/JZ+qwSnQ28rmNFBy2XWzv/54VAc8UO3FnMi/jgtHDVpWmBqJUO
UpsbXLthEmzMltucs0bOsUCg3XtkxaPLVgp+inYWvvgkJDVQHCm5Ez21D//enPej
xv2+efO1uMEV9PkhdqEx3MG9ZeHpUYMmG5OVQ2faEhoSX/Nm5LGTe5B6To7mm5+D
g7l2wcZGWY/Fw+DdklmwXECzAo8ulMQVHBb5V2lh9cfp/1hV5vyz+IrhSm7TM69V
YToYmdkKdmI/ne1ny+Uql/1T0iFwG2XYGCvg5UE+i4zAyIvALLGXc3+sOaOYRYCh
R0Cit7HB8bTyvpRNfVcKIgb5c0kdhae8WRnB/rNo2KHTjyI6NxGaXAC2Yki3ZpqE
I/sYSr/ZEmKcWcEJ68qP1c6B54QD5pQdmmbblQxBNAl/6prBh0zkIjc+TOz5Lvcd
oR+FjFuiZCCpYxIZxtjV
=yFFB
-----END PGP SIGNATURE-----
Antonio Quartulli (4):
batman-adv: fix size of batadv_icmp_header
batman-adv: fix alignment for batadv_tvlv_tt_change
batman-adv: clean nf state when removing protocol header
batman-adv: fix vlan header access
Simon Wunderlich (3):
batman-adv: fix alignment for batadv_coded_packet
batman-adv: fix header alignment by unrolling batadv_header
batman-adv: fix size of batadv_bla_claim_dst
-----------------------------------------------------------------------
--
linux integration
9 years, 1 month
[batman-adv] master: batman-adv: fix compat sparse errors for BUILD_BUG_ON in <= 2.6.39 (46b165b)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 46b165b1793c47c1384fa2bac026ee50f5f54eb2
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Fri Dec 27 14:05:37 2013 +0100
batman-adv: fix compat sparse errors for BUILD_BUG_ON in <= 2.6.39
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
46b165b1793c47c1384fa2bac026ee50f5f54eb2
compat.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/compat.h b/compat.h
index a1c8396..92f88ee 100644
--- a/compat.h
+++ b/compat.h
@@ -207,6 +207,13 @@ static inline void skb_reset_mac_len(struct sk_buff *skb)
skb->mac_len = skb->network_header - skb->mac_header;
}
+#undef BUILD_BUG_ON
+#ifdef __CHECKER__
+#define BUILD_BUG_ON(condition) (0)
+#else /* __CHECKER__ */
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+#endif /* __CHECKER__ */
+
#endif /* < KERNEL_VERSION(3, 0, 0) */
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
9 years, 1 month
[batman-adv] master: batman-adv: fix NULL pointer deref in batadv_find_best_neighbor (183150b)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 183150bf258f27683cad5c0e28c4aa638798023c
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Thu Dec 26 18:57:01 2013 +0100
batman-adv: fix NULL pointer deref in batadv_find_best_neighbor
If there is no best neighbor, don't dereference the NULL pointer. Try to
acquire the neighbor node right in the loop instead. There also was a
logic bug, finding the worst instead of the best neighbor.
Introduced by 9bb33b8d88e318c4879d37d06ad28e3e018b9036 ("batman-adv:
split tq information in neigh_node struct")
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
183150bf258f27683cad5c0e28c4aa638798023c
originator.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/originator.c b/originator.c
index 2243003..4a5d027 100644
--- a/originator.c
+++ b/originator.c
@@ -783,14 +783,19 @@ batadv_find_best_neighbor(struct batadv_priv *bat_priv,
struct batadv_algo_ops *bao = bat_priv->bat_algo_ops;
rcu_read_lock();
- hlist_for_each_entry_rcu(neigh, &orig_node->neigh_list, list)
- if (!best ||
- (bao->bat_neigh_cmp(neigh, if_outgoing,
- best, if_outgoing) <= 0))
- best = neigh;
-
- if (!atomic_inc_not_zero(&best->refcount))
- best = NULL;
+ hlist_for_each_entry_rcu(neigh, &orig_node->neigh_list, list) {
+ if (best && (bao->bat_neigh_cmp(neigh, if_outgoing,
+ best, if_outgoing) <= 0))
+ continue;
+
+ if (!atomic_inc_not_zero(&neigh->refcount))
+ continue;
+
+ if (best)
+ batadv_neigh_node_free_ref(best);
+
+ best = neigh;
+ }
rcu_read_unlock();
return best;
9 years, 1 month
[batman-adv] next: batman-adv: fix vlan header access (c03be25)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : next
>---------------------------------------------------------------
commit c03be25aba23b39189f8e3858aed1dd03061a3ed
Author: Antonio Quartulli <antonio(a)meshcoding.com>
Date: Mon Dec 23 21:43:39 2013 +0100
batman-adv: fix vlan header access
When batadv_get_vid() is invoked in interface_rx() the
batman-adv header has already been removed, therefore
the header_len argument has to be 0.
Introduced by 580d7919f19e4f73ccd79e82a532af2bdc638042
("batman-adv: add the VLAN ID attribute to the TT entry")
Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
c03be25aba23b39189f8e3858aed1dd03061a3ed
soft-interface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/soft-interface.c b/soft-interface.c
index 875a702..a8f99d1 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -351,7 +351,7 @@ void batadv_interface_rx(struct net_device *soft_iface,
*/
nf_reset(skb);
- vid = batadv_get_vid(skb, hdr_size);
+ vid = batadv_get_vid(skb, 0);
ethhdr = eth_hdr(skb);
switch (ntohs(ethhdr->h_proto)) {
9 years, 1 month
[batman-adv] master: batman-adv: add build checks for packet sizes (30e6045)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 30e60452fcfdc5dbb2e46998b8d2476672ded929
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Tue Dec 17 19:12:12 2013 +0100
batman-adv: add build checks for packet sizes
With unrolling the batadv_header into the respective structures, the
offsetof checks are now useless. Instead, add build checks for all
packet types which go over the wire to avoid problems with wrong sizes
or compatibility issues on some architectures which don't use every day.
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
30e60452fcfdc5dbb2e46998b8d2476672ded929
main.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/main.c b/main.c
index 945e441..ad6aeed 100644
--- a/main.c
+++ b/main.c
@@ -419,13 +419,23 @@ static void batadv_recv_handler_init(void)
for (i = BATADV_UNICAST_MIN; i <= BATADV_UNICAST_MAX; i++)
batadv_rx_handler[i] = batadv_recv_unhandled_unicast_packet;
- /* compile time checks for struct member offsets */
- BUILD_BUG_ON(offsetof(struct batadv_unicast_4addr_packet, src) != 10);
- BUILD_BUG_ON(offsetof(struct batadv_unicast_packet, dest) != 4);
- BUILD_BUG_ON(offsetof(struct batadv_unicast_tvlv_packet, dst) != 4);
- BUILD_BUG_ON(offsetof(struct batadv_frag_packet, dest) != 4);
- BUILD_BUG_ON(offsetof(struct batadv_icmp_packet, dst) != 4);
- BUILD_BUG_ON(offsetof(struct batadv_icmp_packet_rr, dst) != 4);
+ /* compile time checks for sizes */
+ BUILD_BUG_ON(sizeof(struct batadv_bla_claim_dst) != 6);
+ BUILD_BUG_ON(sizeof(struct batadv_ogm_packet) != 24);
+ BUILD_BUG_ON(sizeof(struct batadv_icmp_header) != 20);
+ BUILD_BUG_ON(sizeof(struct batadv_icmp_packet) != 20);
+ BUILD_BUG_ON(sizeof(struct batadv_icmp_packet_rr) != 116);
+ BUILD_BUG_ON(sizeof(struct batadv_unicast_packet) != 10);
+ BUILD_BUG_ON(sizeof(struct batadv_unicast_4addr_packet) != 18);
+ BUILD_BUG_ON(sizeof(struct batadv_frag_packet) != 20);
+ BUILD_BUG_ON(sizeof(struct batadv_bcast_packet) != 14);
+ BUILD_BUG_ON(sizeof(struct batadv_coded_packet) != 46);
+ BUILD_BUG_ON(sizeof(struct batadv_unicast_tvlv_packet) != 20);
+ BUILD_BUG_ON(sizeof(struct batadv_tvlv_hdr) != 4);
+ BUILD_BUG_ON(sizeof(struct batadv_tvlv_gateway_data) != 8);
+ BUILD_BUG_ON(sizeof(struct batadv_tvlv_tt_vlan_data) != 8);
+ BUILD_BUG_ON(sizeof(struct batadv_tvlv_tt_change) != 12);
+ BUILD_BUG_ON(sizeof(struct batadv_tvlv_roam_adv) != 8);
/* broadcast packet */
batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet;
9 years, 1 month
[batman-adv] master's head updated: Merge branch 'next' (7bfb138)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
Branch 'master' now includes:
96bd723 Revert "batman-adv: free nf_bridge member on locally delivered skb"
1356028 batman-adv: clean nf state when removing protocol header
7678d5d Merge branch 'maint' into next
7bfb138 Merge branch 'next'
9 years, 1 month
[batman-adv] master: Merge branch 'next' (7bfb138)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 7bfb1387d4a768195cc6eb2322782e7581b61813
Merge: 0fff84d 7678d5d
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Wed Dec 25 22:12:18 2013 +0800
Merge branch 'next'
>---------------------------------------------------------------
7bfb1387d4a768195cc6eb2322782e7581b61813
soft-interface.c | 13 +++++--------
soft-interface.h | 16 ----------------
2 files changed, 5 insertions(+), 24 deletions(-)
diff --cc soft-interface.c
index 2190466,875a702..2f1e843
--- a/soft-interface.c
+++ b/soft-interface.c
@@@ -394,32 -394,10 +399,24 @@@ void batadv_interface_rx(struct net_dev
batadv_tt_add_temporary_global_entry(bat_priv, orig_node,
ethhdr->h_source, vid);
- if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest,
- vid))
+ if (is_multicast_ether_addr(ethhdr->h_dest)) {
+ /* set the mark on broadcast packets if AP isolation is ON and
+ * the packet is coming from an "isolated" client
+ */
+ if (batadv_vlan_ap_isola_get(bat_priv, vid) &&
+ batadv_tt_global_is_isolated(bat_priv, ethhdr->h_source,
+ vid)) {
+ /* save bits in skb->mark not covered by the mask and
+ * apply the mark on the rest
+ */
+ skb->mark &= ~bat_priv->isolation_mark_mask;
+ skb->mark |= bat_priv->isolation_mark;
+ }
+ } else if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source,
+ ethhdr->h_dest, vid)) {
goto dropped;
+ }
- /* Clean the netfilter state before delivering the skb.
- * This packet may have traversed a bridge when it was encapsulated into
- * the batman header. Now that the header has been removed, the
- * netfilter state must be cleaned up to avoid to mess up with a
- * possible second bridge
- */
- batadv_nf_bridge_skb_free(skb);
-
netif_rx(skb);
goto out;
9 years, 1 month