commits January 2015

commits@lists.open-mesh.org

1 participants
47 discussions

[linux-merge]linux integration; annotated tag, v3.19-rc6, created. v3.19-rc6
by postmaster＠open-mesh.org 26 Jan '15

26 Jan '15

The annotated tag, v3.19-rc6 has been created at d84422ebc1dc4397355e56ea36a8605089afd12a (tag) tagging 26bc420b59a38e4e6685a73345a0def461136dce (commit) replaces v3.19-rc5 tagged by Linus Torvalds on Sun Jan 25 20:04:53 2015 -0800 - Shortlog ------------------------------------------------------------ Linux 3.19-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUxbzlAAoJEHm+PkMAQRiGtqYIAJ8YlKX9cXKYmXx8/FncINH+ 2erj94KyHG080R1uwSq1+7zXWCZUUlxiJnDnsup5rG0dImcicqgOE48oHax1aN6b yHfPONkTjNJ1HYepuGC3YWCG9wIjPZQ5S8KHrwRjyVoE+ddhe9gWgvArA3jl/fW/ 2fYNWekoRoMcRiNb4/w2weyOOBywdSVpmj0WYiwdztysG2ymw5hUXRHJhvSf1AFm RQJfUHkhCOYpQGY7XFba/1uGhTJfOgDmYAfspAOLzmrXE/DJcCutsVdBZO+12fAL nhGpM/PkRYxMvwzDKIUoG35qsymYOMqo54oXhr0S2JjyXTGdGmB6qHxIfqnV5Tk= =O/Lr -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[alfred] master: alfred: Tighten size check on received packet (0e2728c)
by postmaster＠open-mesh.org 23 Jan '15

23 Jan '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 0e2728c19f507403d31bacb94840f760197d4ccb Author: Jan-Philipp Litza <janphilipp(a)litza.de> Date: Mon Jan 19 21:59:32 2015 +0100 alfred: Tighten size check on received packet When first checking if a received packet is truncated, the size of the alfred_tlv structure is ignored, thus allowing packets that are truncated by 4 bytes or less to pass the check unnoticed. Even the check itself might access memory after the packet if its size was only 2 bytes or less. Signed-off-by: Jan-Philipp Litza <janphilipp(a)litza.de> Acked-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 0e2728c19f507403d31bacb94840f760197d4ccb recv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recv.c b/recv.c index 90db0b3..870485f 100644 --- a/recv.c +++ b/recv.c @@ -402,7 +402,8 @@ int recv_alfred_packet(struct globals *globals, struct interface *interface) return -1; /* drop truncated packets */ - if (length < ((int)ntohs(packet->length))) + if (length < (int)sizeof(*packet) || + length < (int)(ntohs(packet->length) + sizeof(*packet))) return -1; /* drop incompatible packet */

1 0

[linux-merge]linux integration; annotated tag, v3.19-rc5, created. v3.19-rc5
by postmaster＠open-mesh.org 18 Jan '15

18 Jan '15

The annotated tag, v3.19-rc5 has been created at 49e185e202071d50250678cd8c3ca8ad667d47a4 (tag) tagging ec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc (commit) replaces v3.19-rc4 tagged by Linus Torvalds on Sun Jan 18 18:02:35 2015 +1200 - Shortlog ------------------------------------------------------------ Linux 3.19-rc5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUu0x7AAoJEHm+PkMAQRiGH/8H/14SgHC8A+tGEY1Hmgr7Y6ah kAcev/QMIxvtxKK0zdhgSILiBUrbK1CAXFGbueUAHgSaCucry5rpJvhFCIzSaCmm 60yLZKvNrxXX4Zc1SYxxW+2EfDCNd0tO6uZK30kyzYYmw6fCgLMEXL6pFI0wFJRg G41yL7MogjJJP0JFGjwrFTeJ6ZBahErOmMpx1qrHuDN8cbdZvG8w6A0KP7ch6Ct1 qdwcpOK4L9AXG+fbE7AJCSBkVev4KqwknPSWQ+jWX7ftw3q0P1O6dXY94ob3PqVi jsWmraOCd5uJrX9uSiOJCsbwoaHHMTNOsEF71qQKDrQzcGCPJAxd1Mi696JdDAQ= =jNTS -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v3.19-rc4, created. v3.19-rc4
by postmaster＠open-mesh.org 11 Jan '15

11 Jan '15

The annotated tag, v3.19-rc4 has been created at b615659d48a613fd2cc6fd8b5f35194ff00d0b61 (tag) tagging eaa27f34e91a14cdceed26ed6c6793ec1d186115 (commit) replaces v3.19-rc3 tagged by Linus Torvalds on Sun Jan 11 12:45:04 2015 -0800 - Shortlog ------------------------------------------------------------ linux 3.19-rc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUsuDQAAoJEHm+PkMAQRiGnecH/0RO9UKnEduOTRPaZGXAjGI8 N0FvNia8qn7f+XnvN62pG/YZZqi2uvuy37vwAXMtS6KXEgaDG9Wq4fVrhOaJ5VgL QOmPdVGUa+1PuPcMYj/QLIFRfIHvIY/XVZWXrcIyYfQdBAAoJ2q23qx/yFmdyTwf +enAv+PV4ZVNMEANyN9KS7xX5gPbSDl36AOhm6lXDvrlem4mbnhRuUtYez9R8KTK VNfkKZQRDOgl4/ns0ndzpAUhaDj1JJGoLRgMXKna33XgtzSEL4XijvImdnoIXp5N Z98Jc1N5Vg5OcUFeGJC3bRR27m39xoOHQk2ufY43uAIfB3Ez/C7m/r7b50ZVWfs= =J7TO -----END PGP SIGNATURE----- Linus Lüssing (4): batman-adv: fix delayed foreign originator recognition batman-adv: fix counter for multicast supporting nodes batman-adv: fix multicast counter when purging originators batman-adv: fix potential TT client + orig-node memory leak Martin Hundebøll (1): batman-adv: fix lock class for decoding hash in network-coding.c Simon Wunderlich (1): batman-adv: fix and simplify condition when bonding should be used ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: iv_ogm_aggr_packet, bool return value (ec3b2d9)
by postmaster＠open-mesh.org 11 Jan '15

11 Jan '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ec3b2d9af7630a62f1210d73dda84bf7fb0b15f4 Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:27 2014 +0100 batman-adv: iv_ogm_aggr_packet, bool return value This function returns bool values, so it should be defined to return them instead of the whole int range. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- ec3b2d9af7630a62f1210d73dda84bf7fb0b15f4 bat_iv_ogm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 7b935a8..5cd0e47 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -392,8 +392,8 @@ static uint8_t batadv_hop_penalty(uint8_t tq, } /* is there another aggregated packet here? */ -static int batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len, - __be16 tvlv_len) +static bool batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len, + __be16 tvlv_len) { int next_buff_pos = 0;

1 0

[batman-adv] master: batman-adv: iv_ogm_iface_enable, direct return values (0cc4569)
by postmaster＠open-mesh.org 11 Jan '15

11 Jan '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 0cc45699f6f17b3ed3e2542540ca0634f4e20ed8 Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:26 2014 +0100 batman-adv: iv_ogm_iface_enable, direct return values Directly return error values. No need to use a return variable. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 0cc45699f6f17b3ed3e2542540ca0634f4e20ed8 bat_iv_ogm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 00e00e0..7b935a8 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -308,7 +308,6 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) struct batadv_ogm_packet *batadv_ogm_packet; unsigned char *ogm_buff; uint32_t random_seqno; - int res = -ENOMEM; /* randomize initial seqno to avoid collision */ get_random_bytes(&random_seqno, sizeof(random_seqno)); @@ -317,7 +316,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); if (!ogm_buff) - goto out; + return -ENOMEM; hard_iface->bat_iv.ogm_buff = ogm_buff; @@ -329,10 +328,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) batadv_ogm_packet->reserved = 0; batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE; - res = 0; - -out: - return res; + return 0; } static void batadv_iv_ogm_iface_disable(struct batadv_hard_iface *hard_iface)

1 0

[batman-adv] master: batman-adv: Makefile, Sort alphabetically (d857186)
by postmaster＠open-mesh.org 11 Jan '15

11 Jan '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d85718602397552befa7829a52c67ba491d3907c Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:25 2014 +0100 batman-adv: Makefile, Sort alphabetically The whole Makefile is sorted, just the multicast rule is not at the right position. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d85718602397552befa7829a52c67ba491d3907c Makefile.kbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.kbuild b/Makefile.kbuild index 96fa99b..6903703 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -29,6 +29,7 @@ batman-adv-y += hard-interface.o batman-adv-y += hash.o batman-adv-y += icmp_socket.o batman-adv-y += main.o +batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += multicast.o batman-adv-$(CONFIG_BATMAN_ADV_NC) += network-coding.o batman-adv-y += originator.o batman-adv-y += routing.o @@ -36,4 +37,3 @@ batman-adv-y += send.o batman-adv-y += soft-interface.o batman-adv-y += sysfs.o batman-adv-y += translation-table.o -batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += multicast.o

1 0

[batman-adv] master: batman-adv: tvlv realloc, move error handling into if block (9aef872)
by postmaster＠open-mesh.org 11 Jan '15

11 Jan '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 9aef87286bbfac356c3d09dc80d96da015064295 Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:23 2014 +0100 batman-adv: tvlv realloc, move error handling into if block Instead of hiding the normal function flow inside an if block, we should just put the error handling into the if block. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 9aef87286bbfac356c3d09dc80d96da015064295 main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/main.c b/main.c index 12fc77b..a36cd71 100644 --- a/main.c +++ b/main.c @@ -819,15 +819,15 @@ static bool batadv_tvlv_realloc_packet_buff(unsigned char **packet_buff, new_buff = kmalloc(min_packet_len + additional_packet_len, GFP_ATOMIC); /* keep old buffer if kmalloc should fail */ - if (new_buff) { - memcpy(new_buff, *packet_buff, min_packet_len); - kfree(*packet_buff); - *packet_buff = new_buff; - *packet_buff_len = min_packet_len + additional_packet_len; - return true; - } + if (!new_buff) + return false; + + memcpy(new_buff, *packet_buff, min_packet_len); + kfree(*packet_buff); + *packet_buff = new_buff; + *packet_buff_len = min_packet_len + additional_packet_len; - return false; + return true; } /**

1 0

[batman-adv] master: batman-adv: debugfs, avoid compiling for !DEBUG_FS (fe67bb4)
by postmaster＠open-mesh.org 11 Jan '15

11 Jan '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit fe67bb41f0e1647c3b05aeb4b736a1171bff496b Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:18 2014 +0100 batman-adv: debugfs, avoid compiling for !DEBUG_FS Normally the debugfs framework will return error pointer with -ENODEV for function calls when DEBUG_FS is not set. batman does not notice this error code and continues trying to create debugfs files and executes more code. We can avoid this code execution by disabling compiling debugfs.c when DEBUG_FS is not set. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- fe67bb41f0e1647c3b05aeb4b736a1171bff496b Makefile.kbuild | 2 +- debugfs.c | 8 -------- debugfs.h | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/Makefile.kbuild b/Makefile.kbuild index eb7d8c0..96fa99b 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -20,7 +20,7 @@ obj-$(CONFIG_BATMAN_ADV) += batman-adv.o batman-adv-y += bat_iv_ogm.o batman-adv-y += bitarray.o batman-adv-$(CONFIG_BATMAN_ADV_BLA) += bridge_loop_avoidance.o -batman-adv-y += debugfs.o +batman-adv-$(CONFIG_DEBUG_FS) += debugfs.o batman-adv-$(CONFIG_BATMAN_ADV_DAT) += distributed-arp-table.o batman-adv-y += fragmentation.o batman-adv-y += gateway_client.o diff --git a/debugfs.c b/debugfs.c index a497287..9d337b5 100644 --- a/debugfs.c +++ b/debugfs.c @@ -482,11 +482,7 @@ rem_attr: debugfs_remove_recursive(hard_iface->debug_dir); hard_iface->debug_dir = NULL; out: -#ifdef CONFIG_DEBUG_FS return -ENOMEM; -#else - return 0; -#endif /* CONFIG_DEBUG_FS */ } /** @@ -541,11 +537,7 @@ rem_attr: debugfs_remove_recursive(bat_priv->debug_dir); bat_priv->debug_dir = NULL; out: -#ifdef CONFIG_DEBUG_FS return -ENOMEM; -#else - return 0; -#endif /* CONFIG_DEBUG_FS */ } void batadv_debugfs_del_meshif(struct net_device *dev) diff --git a/debugfs.h b/debugfs.h index 37c4d6d..5db336a 100644 --- a/debugfs.h +++ b/debugfs.h @@ -20,6 +20,8 @@ #define BATADV_DEBUGFS_SUBDIR "batman_adv" +#if IS_ENABLED(CONFIG_DEBUG_FS) + void batadv_debugfs_init(void); void batadv_debugfs_destroy(void); int batadv_debugfs_add_meshif(struct net_device *dev); @@ -27,4 +29,36 @@ void batadv_debugfs_del_meshif(struct net_device *dev); int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface); void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface); +#else + +static inline void batadv_debugfs_init(void) +{ +} + +static inline void batadv_debugfs_destroy(void) +{ +} + +static inline int batadv_debugfs_add_meshif(struct net_device *dev) +{ + return 0; +} + +static inline void batadv_debugfs_del_meshif(struct net_device *dev) +{ +} + +static inline int batadv_debugfs_add_hardif( + struct batadv_hard_iface *hard_iface) +{ + return 0; +} + +static inline void batadv_debugfs_del_hardif( + struct batadv_hard_iface *hard_iface) +{ +} + +#endif + #endif /* _NET_BATMAN_ADV_DEBUGFS_H_ */

1 0

[batman-adv] master: batman-adv: Use only queued fragments when merging (939717c)
by postmaster＠open-mesh.org 11 Jan '15

11 Jan '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 939717ced5fdbe211ecb8a9c93952310df922f6b Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Dec 1 10:37:28 2014 +0100 batman-adv: Use only queued fragments when merging The fragment queueing code now validates the total_size of each fragment, checks when enough fragments are queued to allow to merge them into a single packet and if the fragments have the correct size. Therefore, it is not required to have any other parameter for the merging function than a list of queued fragments. This change should avoid problems like in the past when the different skb from the list and the function parameter were mixed incorrectly. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 939717ced5fdbe211ecb8a9c93952310df922f6b fragmentation.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/fragmentation.c b/fragmentation.c index 8f074bc..9e06457 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -231,19 +231,13 @@ err: * Returns the merged skb or NULL on error. */ static struct sk_buff * -batadv_frag_merge_packets(struct hlist_head *chain, struct sk_buff *skb) +batadv_frag_merge_packets(struct hlist_head *chain) { struct batadv_frag_packet *packet; struct batadv_frag_list_entry *entry; struct sk_buff *skb_out = NULL; int size, hdr_size = sizeof(struct batadv_frag_packet); - /* Make sure incoming skb has non-bogus data. */ - packet = (struct batadv_frag_packet *)skb->data; - size = ntohs(packet->total_size); - if (size > batadv_frag_size_limit()) - goto free; - /* Remove first entry, as this is the destination for the rest of the * fragments. */ @@ -252,6 +246,9 @@ batadv_frag_merge_packets(struct hlist_head *chain, struct sk_buff *skb) skb_out = entry->skb; kfree(entry); + packet = (struct batadv_frag_packet *)skb_out->data; + size = ntohs(packet->total_size); + /* Make room for the rest of the fragments. */ if (pskb_expand_head(skb_out, 0, size - skb_out->len, GFP_ATOMIC) < 0) { kfree_skb(skb_out); @@ -307,7 +304,7 @@ bool batadv_frag_skb_buffer(struct sk_buff **skb, if (hlist_empty(&head)) goto out; - skb_out = batadv_frag_merge_packets(&head, *skb); + skb_out = batadv_frag_merge_packets(&head); if (!skb_out) goto out_err;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2015