commits May 2013

commits@lists.open-mesh.org

1 participants
91 discussions

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

21 May '13

The annotated tag, batman-adv-fix-for-davem has been updated to af9a1c058000e9c74e7a694f15e09c0ef576378e (tag) from 30dbf81a6fd2461dd0023751426a6d3d36c6832c (which is now obsolete) tagging f69ae770e74df420fbcf93aae81b30a5dcc73b7d (commit) replaces v3.10-rc1 tagged by Antonio Quartulli on Tue May 21 21:37:07 2013 +0200 - Shortlog ------------------------------------------------------------ Included change: - fix double free in case of failure during mesh initialisation -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABCAAGBQJRm8z4AAoJEADl0hg6qKeO6ggP/2RaF9J8tJQwSzkNnP8ELQL9 XncMEAGHifLZm8GfvgIRcGyHMWh+0iD+H1ZNAb+q55XYEsP6d0pz6QdJCQEgNt3I 4knuGBEk911vlKmmTn91BYUGUjsTD0ApfCOw62V2Le+AI6SyyP0im86TlvK0FkVU I+t/HTaZp9n3vW9MLF4xBFwD/RmX54sW8JeLZBjvpIOVPJbCP3j+yYRqMyxgSezL DeJNUjtqLT3pa3+ePeVEH3eAVKjyT0izUt8nmPNG2uD0vHej/qwAky82JBO1bNd2 c5+Da/7EqKoTSgIw9AZhQVY2qhiYfcdtRT473C5QpRARmoGi5phkY5n7RQ31PqxL /bKfA6JSDYNaHYCcPHI7vE1sANdRiGeU77+nHZQ9JQ7dJ6sFAwZQgZTC+IIgH1tU /12h+pPQjjEOSCx3dzlIaNj75N+FsfHW85XDMDaX3+JcfeMQyMsezheeOmaeaepX QKKQxxuEsoSWworx7lOVB7oxUXZXBCBwR4n87kjHnoJ7KhPVyWf8dQ4lpWLwVCIS acQnYeFbumuhd0wYPVTroGQMqc47jLONDqmOzdbI++DanZrI0qhdTXbcFoiI044w KB7UuQ/fWIFrEVRSf3UQwoNlmk1dEgduqvGiqVG3P9ok8ZhvyFUCinq3d4iKZMnS tKh7oCknj2wj4B4kRHHL =/mWv -----END PGP SIGNATURE----- Antonio Quartulli (2): batman-adv: make DAT drop ARP requests targeting local clients batman-adv: reorder clean up routine in order to avoid race conditions Linus Lüssing (1): batman-adv: Fix rcu_barrier() miss due to double call_rcu() in TT code Marek Lindner (2): batman-adv: check proto length before accessing proto string buffer batman-adv: check return value of pskb_trim_rcsum() Martin Hundebøll (1): batman-adv: Avoid double freeing of bat_counters ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] maint: batman-adv: Avoid double freeing of bat_counters (a5d7963)
by postmaster＠open-mesh.org 21 May '13

21 May '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit a5d79639a76d7a71116abbc369a246bd1fcbf947 Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Wed Apr 17 21:13:16 2013 +0200 batman-adv: Avoid double freeing of bat_counters On errors in batadv_mesh_init(), bat_counters will be freed in both batadv_mesh_free() and batadv_softif_init_late(). This patch fixes this by returning earlier from batadv_softif_init_late() in case of errors in batadv_mesh_init() and by setting bat_counters to NULL after freeing. Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- a5d79639a76d7a71116abbc369a246bd1fcbf947 main.c | 1 + soft-interface.c | 1 + 2 files changed, 2 insertions(+) diff --git a/main.c b/main.c index 1240f07..51aafd6 100644 --- a/main.c +++ b/main.c @@ -181,6 +181,7 @@ void batadv_mesh_free(struct net_device *soft_iface) batadv_originator_free(bat_priv); free_percpu(bat_priv->bat_counters); + bat_priv->bat_counters = NULL; atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE); } diff --git a/soft-interface.c b/soft-interface.c index 6f20d33..819dfb0 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -505,6 +505,7 @@ unreg_debugfs: batadv_debugfs_del_meshif(dev); free_bat_counters: free_percpu(bat_priv->bat_counters); + bat_priv->bat_counters = NULL; return ret; }

1 0

[linux-merge]linux integration; annotated tag, v3.10-rc2, created. v3.10-rc2
by postmaster＠open-mesh.org 20 May '13

20 May '13

The annotated tag, v3.10-rc2 has been created at a8c6d53c4d84b3a5eb182758a9cdceceba4691da (tag) tagging c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (commit) replaces v3.10-rc1 tagged by Linus Torvalds on Mon May 20 14:37:49 2013 -0700 - Shortlog ------------------------------------------------------------ Linux 3.10-rc2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRmpexAAoJEHm+PkMAQRiGrRIH/1uWFW38RvaCV/PXm/ia6Z+x BfBJfBIvPxGwb4n7aQNQlhU25xkfrPZ6szO4WiBH5/KPH3xYi2I2OZ1AzffkYqMF BWkPmsPK6EsTdp16zsi6JtH2aXArG4SpYA7ZamPvDkmfigHuiZg7GlL/9eHTRPNV P7Q8JToOrcnP8RoGgNj0uFiQeQbc62Kmoq7WuPtUhVlpQCCCknXgOJiYgz9w6Xe9 /i79YFS8WRrzAquExT1NbIOh4ZMqB9MvuroaVWy8JDDLUyz7QUvOCe3tCDNguwgi FdWvU6nfkdQq5SLaWCWXDE9Rp/pL1MvfBn9vCOwFcp42aw0aQ0PgJVIXvsqufd0= =jgDI -----END PGP SIGNATURE----- Antonio Quartulli (2): batman-adv: make DAT drop ARP requests targeting local clients batman-adv: reorder clean up routine in order to avoid race conditions Marek Lindner (2): batman-adv: check proto length before accessing proto string buffer batman-adv: check return value of pskb_trim_rcsum() ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master: Merge branch 'next' (5d440fd)
by postmaster＠open-mesh.org 18 May '13

18 May '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 5d440fd7b673db2916efa390540f79ad7e6acf85 Merge: 89a1550 2f65f34 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat May 18 18:33:03 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- 5d440fd7b673db2916efa390540f79ad7e6acf85 bisect_iv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[batctl] master's head updated: Merge branch 'next' (5d440fd)
by postmaster＠open-mesh.org 18 May '13

18 May '13

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 2f65f34 batctl: fix typos in error messages 5d440fd Merge branch 'next'

1 0

[batctl] next: batctl: fix typos in error messages (2f65f34)
by postmaster＠open-mesh.org 18 May '13

18 May '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 2f65f3462df474be0ef58599be04774474626419 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Fri May 17 18:02:21 2013 +0200 batctl: fix typos in error messages Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 2f65f3462df474be0ef58599be04774474626419 bisect_iv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bisect_iv.c b/bisect_iv.c index f958511..0dbc2ef 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -1525,13 +1525,13 @@ int bisect_iv(int argc, char **argv) num_parsed_files = 0; if ((rt_orig_ptr) && (trace_orig_ptr)) { - fprintf(stderr, "Error - the 'print routing table' option can't be used together with the the 'trace seqno' option\n"); + fprintf(stderr, "Error - the 'print routing table' option can't be used together with the 'trace seqno' option\n"); goto err; } else if ((loop_orig_ptr) && (trace_orig_ptr)) { - fprintf(stderr, "Error - the 'loop detection' option can't be used together with the the 'trace seqno' option\n"); + fprintf(stderr, "Error - the 'loop detection' option can't be used together with the 'trace seqno' option\n"); goto err; } else if ((loop_orig_ptr) && (rt_orig_ptr)) { - fprintf(stderr, "Error - the 'loop detection' option can't be used together with the the 'print routing table' option\n"); + fprintf(stderr, "Error - the 'loop detection' option can't be used together with the 'print routing table' option\n"); goto err; } else if (rt_orig_ptr) { res = get_orig_addr(rt_orig_ptr, orig);

1 0

[batman-adv] master: batman-adv: use VLAN_ETH_HLEN instead of sizeof(struct vlan_eth_hdr) (925be3e)
by postmaster＠open-mesh.org 18 May '13

18 May '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 925be3ea3615400ebd79c3a4a269b02dd4894272 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun May 12 21:57:09 2013 +0200 batman-adv: use VLAN_ETH_HLEN instead of sizeof(struct vlan_eth_hdr) Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 925be3ea3615400ebd79c3a4a269b02dd4894272 bridge_loop_avoidance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index e9d8e0b..9e691b0 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1376,7 +1376,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb, ethhdr = (struct ethhdr *)(((uint8_t *)skb->data) + hdr_size); if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { - if (!pskb_may_pull(skb, hdr_size + sizeof(struct vlan_ethhdr))) + if (!pskb_may_pull(skb, hdr_size + VLAN_ETH_HLEN)) return 0; vhdr = (struct vlan_ethhdr *)(skb->data + hdr_size);

1 0

[batman-adv] master: batman-adv: h_vlan_encapsulated_proto access refactoring (9eff62f)
by postmaster＠open-mesh.org 18 May '13

18 May '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 9eff62fcef81f356c63b47fcbe16465a562da684 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun May 12 21:51:15 2013 +0200 batman-adv: h_vlan_encapsulated_proto access refactoring In case of a VLAN tagged frame the ethhdr pointer is moved forward by 4 bytes so that the offset of h_proto in struct ethhdr matches the real h_vlan_encapsulated_proto address in the skb. While this trickery is correct it makes the code harder to understand and may lead to bugs in case of re-use of ethhdr for other purposes. This patch introduces a proto variable to make things cleaner and easier to understand. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 9eff62fcef81f356c63b47fcbe16465a562da684 gateway_client.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gateway_client.c b/gateway_client.c index 973f02d..3a27408 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -626,24 +626,29 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) struct iphdr *iphdr; struct ipv6hdr *ipv6hdr; struct udphdr *udphdr; + struct vlan_ethhdr *vhdr; + __be16 proto; /* check for ethernet header */ if (!pskb_may_pull(skb, *header_len + ETH_HLEN)) return false; ethhdr = (struct ethhdr *)skb->data; + proto = ethhdr->h_proto; *header_len += ETH_HLEN; /* check for initial vlan header */ - if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { + if (proto == __constant_htons(ETH_P_8021Q)) { if (!pskb_may_pull(skb, *header_len + VLAN_HLEN)) return false; - ethhdr = (struct ethhdr *)(skb->data + VLAN_HLEN); + + vhdr = (struct vlan_ethhdr *)skb->data; + proto = vhdr->h_vlan_encapsulated_proto; *header_len += VLAN_HLEN; } /* check for ip header */ - switch (ntohs(ethhdr->h_proto)) { - case ETH_P_IP: + switch (proto) { + case __constant_htons(ETH_P_IP): if (!pskb_may_pull(skb, *header_len + sizeof(*iphdr))) return false; iphdr = (struct iphdr *)(skb->data + *header_len); @@ -654,7 +659,7 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) return false; break; - case ETH_P_IPV6: + case __constant_htons(ETH_P_IPV6): if (!pskb_may_pull(skb, *header_len + sizeof(*ipv6hdr))) return false; ipv6hdr = (struct ipv6hdr *)(skb->data + *header_len); @@ -675,11 +680,11 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) *header_len += sizeof(*udphdr); /* check for bootp port */ - if ((ntohs(ethhdr->h_proto) == ETH_P_IP) && + if ((proto == __constant_htons(ETH_P_IP)) && (ntohs(udphdr->dest) != 67)) return false; - if ((ntohs(ethhdr->h_proto) == ETH_P_IPV6) && + if ((proto == __constant_htons(ETH_P_IPV6)) && (ntohs(udphdr->dest) != 547)) return false;

1 0

[batctl] master: Merge branch 'next' (89a1550)
by postmaster＠open-mesh.org 18 May '13

18 May '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 89a1550c7f78b462bdf25f2f462535e1f68c5382 Merge: b80d07f 20cd68b Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat May 18 17:48:31 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- 89a1550c7f78b462bdf25f2f462535e1f68c5382 functions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[batctl] master's head updated: Merge branch 'next' (89a1550)
by postmaster＠open-mesh.org 18 May '13

18 May '13

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 20cd68b batctl: fix false uninitialized variable warning when compiling with O2 89a1550 Merge branch 'next'

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2013