commits December 2014

commits@lists.open-mesh.org

1 participants
14 discussions

[linux-merge]linux integration; annotated tag, v3.19-rc2, created. v3.19-rc2
by postmaster＠open-mesh.org 29 Dec '14

29 Dec '14

The annotated tag, v3.19-rc2 has been created at 9d3d0a958af86c1f52c59ed8932b8915b07c04c2 (tag) tagging b7392d2247cfe6771f95d256374f1a8e6a6f48d6 (commit) replaces v3.19-rc1 tagged by Linus Torvalds on Sun Dec 28 16:50:00 2014 -0800 - Shortlog ------------------------------------------------------------ Linux 3.19-rc2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUoKU4AAoJEHm+PkMAQRiGvzYIAJOrjgTaf/vK2sSGH0398656 wkUomtfmIqDxTGr+DB5OEf59rYODcMYjnVOWwhto9lGtu49MKor35DV0/0J5gQJb l4FE+UA8p2sE22RIAqGB2992pbRVtGpAB0q4PlCGnaYl8vyP8lRe/lozL3/lwPK8 lR7dDOsix5LU75mxqLUTmVXTSwyLW4tIHLt8qwLzJWRqJEAk1Ip1MNf9RnoSSI4C clL5FMEWj3D62a5kVvgguFypqGLnLSvNALqk2RwL3u3SMBDvwnIQD9fTpg8tCihX 2MVNP3IS2KDlPg93p8lzWk8KBTbwWRJCxLT44LexPhhHUTquZTnTg7oJeJdrRy0= =p+ym -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] next: batman-adv: Unify fragment size calculation (eddbc3d)
by postmaster＠open-mesh.org 29 Dec '14

29 Dec '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit eddbc3d739ddb87111a2c30893e19f3176b6e1a6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Dec 1 13:59:44 2014 +0100 batman-adv: Unify fragment size calculation The fragmentation code was replaced in 9b3eab61754d74a93c9840c296013fe3b4a1b606 ("batman-adv: Receive fragmented packets and merge") by an implementation which can handle up to 16 fragments of a packet. The packet is prepared for the split in fragments by the function batadv_frag_send_packet and the actual split is done by batadv_frag_create. Both functions calculate the size of a fragment themself. But their calculation differs because batadv_frag_send_packet also subtracts ETH_HLEN. Therefore, the check in batadv_frag_send_packet if a full fragment can be created may return true even when batadv_frag_create cannot create a full fragment. The function batadv_frag_create doesn't check the size of the skb before splitting it and therefore might try to create a larger fragment than the remaining buffer. This creates an integer underflow and an invalid len is given to skb_split. 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> >--------------------------------------------------------------- eddbc3d739ddb87111a2c30893e19f3176b6e1a6 fragmentation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragmentation.c b/fragmentation.c index 8af3461..00f9e14 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -434,7 +434,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb, * fragments larger than BATADV_FRAG_MAX_FRAG_SIZE */ mtu = min_t(unsigned, mtu, BATADV_FRAG_MAX_FRAG_SIZE); - max_fragment_size = (mtu - header_size - ETH_HLEN); + max_fragment_size = mtu - header_size; max_packet_size = max_fragment_size * BATADV_FRAG_MAX_FRAGMENTS; /* Don't even try to fragment, if we need more than 16 fragments */

1 0

[batman-adv] master: batman-adv: fix misspelled words (ecf7f49)
by postmaster＠open-mesh.org 29 Dec '14

29 Dec '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ecf7f4967bae8baaad6d134291dc8aad7148253f Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sun Nov 2 11:29:56 2014 +0100 batman-adv: fix misspelled words Reported-by: checkpatch Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- ecf7f4967bae8baaad6d134291dc8aad7148253f CHANGELOG | 2 +- bridge_loop_avoidance.c | 4 ++-- main.c | 2 +- packet.h | 4 ++-- routing.c | 2 +- translation-table.c | 2 +- types.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a91e233..affb823 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -248,7 +248,7 @@ batman-adv 2011.4.0: batman-adv 2011.3.1: * don't send all packets to selected gateway as broadcast -* prevent translation table corruptions caused by unintialized memory and +* prevent translation table corruptions caused by uninitialized memory and invalid sizes send through client announcement mechanism -- Tue, 18 Oct 2011 20:40:59 +0200 diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 4fc6cab..ac4b96e 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -244,7 +244,7 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw) spin_unlock_bh(list_lock); } - /* all claims gone, intialize CRC */ + /* all claims gone, initialize CRC */ backbone_gw->crc = BATADV_BLA_CRC_INIT; } @@ -1328,7 +1328,7 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, goto out; } /* not found, add a new entry (overwrite the oldest entry) - * and allow it, its the first occurence. + * and allow it, its the first occurrence. */ curr = (bat_priv->bla.bcast_duplist_curr + BATADV_DUPLIST_SIZE - 1); curr %= BATADV_DUPLIST_SIZE; diff --git a/main.c b/main.c index 3bcd847..12fc77b 100644 --- a/main.c +++ b/main.c @@ -798,7 +798,7 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv, } /** - * batadv_tvlv_realloc_packet_buff - reallocate packet buffer to accomodate + * batadv_tvlv_realloc_packet_buff - reallocate packet buffer to accommodate * requested packet size * @packet_buff: packet buffer * @packet_buff_len: packet buffer size diff --git a/packet.h b/packet.h index facd1fe..b81fbbf 100644 --- a/packet.h +++ b/packet.h @@ -377,7 +377,7 @@ struct batadv_frag_packet { uint8_t reserved:4; uint8_t no:4; #else -#error "unknown bitfield endianess" +#error "unknown bitfield endianness" #endif uint8_t dest[ETH_ALEN]; uint8_t orig[ETH_ALEN]; @@ -453,7 +453,7 @@ struct batadv_coded_packet { * @src: address of the source * @dst: address of the destination * @tvlv_len: length of tvlv data following the unicast tvlv header - * @align: 2 bytes to align the header to a 4 byte boundry + * @align: 2 bytes to align the header to a 4 byte boundary */ struct batadv_unicast_tvlv_packet { uint8_t packet_type; diff --git a/routing.c b/routing.c index 139d2f6..da83982 100644 --- a/routing.c +++ b/routing.c @@ -456,7 +456,7 @@ batadv_find_router(struct batadv_priv *bat_priv, * the last chosen bonding candidate (next_candidate). If no such * router is found, use the first candidate found (the previously * chosen bonding candidate might have been the last one in the list). - * If this can't be found either, return the previously choosen + * If this can't be found either, return the previously chosen * router - obviously there are no other candidates. */ rcu_read_lock(); diff --git a/translation-table.c b/translation-table.c index 84e6f01..07b263a 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2852,7 +2852,7 @@ static void batadv_tt_update_changes(struct batadv_priv *bat_priv, /** * batadv_is_my_client - check if a client is served by the local node * @bat_priv: the bat priv with all the soft interface information - * @addr: the mac adress of the client to check + * @addr: the mac address of the client to check * @vid: VLAN identifier * * Returns true if the client is served by this node, false otherwise. diff --git a/types.h b/types.h index 462a70c..9398c3f 100644 --- a/types.h +++ b/types.h @@ -968,7 +968,7 @@ struct batadv_tt_orig_list_entry { }; /** - * struct batadv_tt_change_node - structure for tt changes occured + * struct batadv_tt_change_node - structure for tt changes occurred * @list: list node for batadv_priv_tt::changes_list * @change: holds the actual translation table diff data */

1 0

[batman-adv] master: batman-adv: remove useless return at the of a void function (d1e5e23)
by postmaster＠open-mesh.org 29 Dec '14

29 Dec '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d1e5e2353eaa8f81e7d5af85c73a7aa89c2b824e Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sun Nov 2 11:29:57 2014 +0100 batman-adv: remove useless return at the of a void function Reported-by: checkpatch Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d1e5e2353eaa8f81e7d5af85c73a7aa89c2b824e debugfs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/debugfs.c b/debugfs.c index d9b9a8e..a497287 100644 --- a/debugfs.c +++ b/debugfs.c @@ -233,7 +233,6 @@ static int batadv_debug_log_setup(struct batadv_priv *bat_priv) static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv) { - return; } #endif

1 0

[batman-adv] master: batman-adv: move misplaced compat code (b609f26)
by postmaster＠open-mesh.org 29 Dec '14

29 Dec '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit b609f2633565303738d115561983dc3567d25ab6 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sun Oct 19 19:59:41 2014 +0200 batman-adv: move misplaced compat code consume_skb() has to be re-defined only for kernels <2.6.30 but the macro was accidentally placed right above any #ifdef block causing the function to be always redefined. Fix this by moving the macro to the proper #ifdef block. Introduced by: 15fb0fab51a3695738f65dfaab045e979fc89dce ("batman-adv add compat code for consume_skb") Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- b609f2633565303738d115561983dc3567d25ab6 compat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compat.h b/compat.h index d3db201..c22fe1c 100644 --- a/compat.h +++ b/compat.h @@ -23,10 +23,10 @@ #include <linux/version.h> /* LINUX_VERSION_CODE */ -#define consume_skb(_skb) kfree_skb(_skb) - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) +#define consume_skb(_skb) kfree_skb(_skb) + #undef __alloc_percpu #define __alloc_percpu(size, align) \ percpu_alloc_mask((size), GFP_KERNEL, cpu_possible_map)

1 0

[linux-merge]linux integration; annotated tag, v3.19-rc1, created. v3.19-rc1
by postmaster＠open-mesh.org 21 Dec '14

21 Dec '14

The annotated tag, v3.19-rc1 has been created at 30c0735c980547061c94ed4ff4e3e6a0b9611ac4 (tag) tagging 97bf6af1f928216fd6c5a66e8a57bfa95a659672 (commit) replaces v3.18 tagged by Linus Torvalds on Sat Dec 20 17:08:59 2014 -0800 - Shortlog ------------------------------------------------------------ Linux 3.19-rc1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUlh2rAAoJEHm+PkMAQRiGizEH/3pm4pHv32izvkgv0hO7DUOr yEQ/omfqwNrvV3mASBodGkjCymR+BWOF3Ojy47kQlPgsdhhki21wHFRq4rs2HV9m Uu1VOqEJbiSIF6S8rEyzYP2vd/wH7iq/91188bHhkWHri8YJ+xB65ybj9QRa0Wgz Y0jChOLwyGi4s2RgaLW9fh8iwfKii0gF57yt6tdyf7S7fRxHtzR+sXqiNnVgJEcA F0XhQk/6MTJz8ucQnjjq6NXT9Q2QyJdiYGL8cPVjZovXarau+y0xdxdZW+THSogG Nrqpe4kk0pdlX0RZNEdtKjFwMqGJ7LlGaXCzcpjYkZ6zHbZfXFTOxkJ80Kpuw5U= =nNJQ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] maint's head updated: batctl: Force \0 termination of string in bisect_iv (c861e47)
by postmaster＠open-mesh.org 15 Dec '14

15 Dec '14

Repository : ssh://git@open-mesh.org/batctl Branch 'maint' now includes: ca58ad2 batctl: Start new development cycle 2656408 batctl: Don't try to close negative file descriptors 4faf653 batctl: Force null termination of string after strncpy a9e88d8 batctl: Use strncpy instead of strcpy for string copy 51b3e92 batctl: Return success only with valid line_ptr in read_file 7e53633 batctl: Initialize complete ping packet before write cc9e48b batctl: Don't provide uninitialized parameter to read_file 63c0932 batctl: Import hash table version from alfred 690d846 batctl: Free hash iterator when breaking out of loop 6f03fcf batctl: Use memleak/error path free implementation of hash_resize c861e47 batctl: Force \0 termination of string in bisect_iv

1 0

[linux-merge]linux integration; annotated tag, v3.18, created. v3.18
by postmaster＠open-mesh.org 08 Dec '14

08 Dec '14

The annotated tag, v3.18 has been created at 5a4a5d52f29d08d923ce8d232b0b497da674dd2c (tag) tagging b2776bf7149bddd1f4161f14f79520f17fc1d71d (commit) replaces v3.18-rc7 tagged by Linus Torvalds on Sun Dec 7 14:21:13 2014 -0800 - Shortlog ------------------------------------------------------------ Linux 3.18 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUhNLZAAoJEHm+PkMAQRiGAEcH/iclYDW7k2GKemMqboy+Ohmh +ELbQothNhlGZlS1wWdD69LBiiXkkQ+ufVYFh/hC0oy0gUdfPMt5t+bOHy6cjn6w 9zOcACtpDKnqbOwRqXZjZgNmIabk7lRjbn7GK4GQqpIaW4oO0FWcT91FFhtGSPDa tjtmGRqDmbNsqfzr18h0WPEpUZmT6MxIdv17AYDliPB1MaaRuAv1Kss05TJrXdfL Oucv+C0uwnybD9UWAz6pLJ3H/HR9VJFdkaJ4Y0pbCHAuxdd1+swoTpicluHlsJA1 EkK5iWQRMpcmGwKvB0unCAQljNpaJiq4/Tlmmv8JlYpMlmIiVLT0D8BZx5q05QQ= =oGNw -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

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

08 Dec '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 210a3cb batman-adv: Calculate extra tail size based on queued fragments a053f89 Merge branch 'maint' into next 21f67df Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (21f67df)
by postmaster＠open-mesh.org 08 Dec '14

08 Dec '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 21f67dfe579b619254aa76281385a0bf93a43600 Merge: 650251a a053f89 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Dec 8 11:40:38 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- 21f67dfe579b619254aa76281385a0bf93a43600 fragmentation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2014