commits December 2015

commits@lists.open-mesh.org

1 participants
47 discussions

[batctl] next: batctl: Remove bogus length check in debugfs_make_path (72b9683)
by postmaster＠open-mesh.org 30 Dec '15

30 Dec '15

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 72b9683b20ef4b91031c0938b2a53b8846343aa3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Dec 14 15:00:47 2015 +0100 batctl: Remove bogus length check in debugfs_make_path The length check never used the mesh_iface length in the size calculation. Instead it used the length of the mountpoint and the format string. But the length of the format string is not the length of the final string. Instead remove this check and depend completely on the return value of snprintf. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 72b9683b20ef4b91031c0938b2a53b8846343aa3 debugfs.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/debugfs.c b/debugfs.c index 04e47e9..3c58195 100644 --- a/debugfs.c +++ b/debugfs.c @@ -42,19 +42,12 @@ static const char *debugfs_known_mountpoints[] = { /* construct a full path to a debugfs element */ int debugfs_make_path(const char *fmt, char *mesh_iface, char *buffer, int size) { - int len; - if (strlen(debugfs_mountpoint) == 0) { buffer[0] = '\0'; return -1; } - len = strlen(debugfs_mountpoint) + strlen(fmt) + 1; - if (len >= size) - return len+1; - - snprintf(buffer, size-1, fmt, debugfs_mountpoint, mesh_iface); - return 0; + return snprintf(buffer, size, fmt, debugfs_mountpoint, mesh_iface); } static int debugfs_found;

1 0

[batman-adv] maint: batman-adv: Fix invalid read while copying bat_iv.bcast_own (cee1039)
by postmaster＠open-mesh.org 30 Dec '15

30 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit cee103946bb05db00e351cf8b5dee9c8aed8d5f8 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Nov 29 01:48:57 2015 +0100 batman-adv: Fix invalid read while copying bat_iv.bcast_own batadv_iv_ogm_orig_del_if removes a part of the bcast_own which previously belonged to the now removed interface. This is done by copying all data which comes before the removed interface and then appending all the data which comes after the removed interface. The address calculation for the position of the data which comes after the removed interface assumed that the bat_iv.bcast_own is a pointer to a single byte datatype. But it is a pointer to unsigned long and thus the calculated position was wrong off factor sizeof(unsigned long). Fixes: 83a8342678a0 ("more basic routing code added (forwarding packets / bitarray added)") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- cee103946bb05db00e351cf8b5dee9c8aed8d5f8 net/batman-adv/bat_iv_ogm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 912d9c3..aa94b4e 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -185,7 +185,8 @@ unlock: static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node, int max_if_num, int del_if_num) { - int chunk_size, ret = -ENOMEM, if_offset; + int ret = -ENOMEM; + size_t chunk_size, if_offset; void *data_ptr = NULL; spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); @@ -203,8 +204,9 @@ static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node, memcpy(data_ptr, orig_node->bat_iv.bcast_own, del_if_num * chunk_size); /* copy second part */ + if_offset = (del_if_num + 1) * chunk_size; memcpy((char *)data_ptr + del_if_num * chunk_size, - orig_node->bat_iv.bcast_own + ((del_if_num + 1) * chunk_size), + (uint8_t *)orig_node->bat_iv.bcast_own + if_offset, (max_if_num - del_if_num) * chunk_size); free_bcast_own:

1 0

[batman-adv] maint: batman-adv: Fix invalid read while copying bat_iv.bcast_own (24b1aae)
by postmaster＠open-mesh.org 30 Dec '15

30 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 24b1aae74b3879552dd6ead96b155d7e52a99599 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Nov 29 01:48:57 2015 +0100 batman-adv: Fix invalid read while copying bat_iv.bcast_own batadv_iv_ogm_orig_del_if removes a part of the bcast_own which previously belonged to the now removed interface. This is done by copying all data which comes before the removed interface and then appending all the data which comes after the removed interface. The address calculation for the position of the data which comes after the removed interface assumed that the bat_iv.bcast_own is a pointer to a single byte datatype. But it is a pointer to unsigned long and thus the calculated position was wrong off factor sizeof(unsigned long). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 24b1aae74b3879552dd6ead96b155d7e52a99599 net/batman-adv/bat_iv_ogm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 912d9c3..aa94b4e 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -185,7 +185,8 @@ unlock: static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node, int max_if_num, int del_if_num) { - int chunk_size, ret = -ENOMEM, if_offset; + int ret = -ENOMEM; + size_t chunk_size, if_offset; void *data_ptr = NULL; spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); @@ -203,8 +204,9 @@ static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node, memcpy(data_ptr, orig_node->bat_iv.bcast_own, del_if_num * chunk_size); /* copy second part */ + if_offset = (del_if_num + 1) * chunk_size; memcpy((char *)data_ptr + del_if_num * chunk_size, - orig_node->bat_iv.bcast_own + ((del_if_num + 1) * chunk_size), + (uint8_t *)orig_node->bat_iv.bcast_own + if_offset, (max_if_num - del_if_num) * chunk_size); free_bcast_own:

1 0

[batman-adv] master: batman-adv: Add lockdep assert for container_list_lock (5f01697)
by postmaster＠open-mesh.org 29 Dec '15

29 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 5f01697e1b43ade7c99fa08552d21c8809e1b956 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 20 09:04:03 2015 +0100 batman-adv: Add lockdep assert for container_list_lock The batadv_tvlv_container* functions state in their kernel-doc that they require tvlv.container_list_lock. Add an assert to automatically detect when this might have been ignored by the caller. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 5f01697e1b43ade7c99fa08552d21c8809e1b956 net/batman-adv/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 9d34be6..8b170e4 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -697,6 +697,8 @@ static struct batadv_tvlv_container { struct batadv_tvlv_container *tvlv_tmp, *tvlv = NULL; + lockdep_assert_held(&bat_priv->tvlv.container_list_lock); + hlist_for_each_entry(tvlv_tmp, &bat_priv->tvlv.container_list, list) { if (tvlv_tmp->tvlv_hdr.type != type) continue; @@ -729,6 +731,8 @@ static u16 batadv_tvlv_container_list_size(struct batadv_priv *bat_priv) struct batadv_tvlv_container *tvlv; u16 tvlv_len = 0; + lockdep_assert_held(&bat_priv->tvlv.container_list_lock); + hlist_for_each_entry(tvlv, &bat_priv->tvlv.container_list, list) { tvlv_len += sizeof(struct batadv_tvlv_hdr); tvlv_len += ntohs(tvlv->tvlv_hdr.len);

1 0

[linux-merge]; annotated tag, v4.4-rc7, created. v4.4-rc7
by postmaster＠open-mesh.org 28 Dec '15

28 Dec '15

The annotated tag, v4.4-rc7 has been created at f5fd7e2626260acc3437bc354279fe55ba26498e (tag) tagging 74bf8efb5fa6e958d2d7c7917b8bb672085ec0c6 (commit) replaces v4.4-rc6 tagged by Linus Torvalds on Sun Dec 27 18:17:55 2015 -0800 - Shortlog ------------------------------------------------------------ Linux 4.4-rc7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJWgJvTAAoJEHm+PkMAQRiGx5YH/0g7Xj6CUcB2XKXOrw0u+WM2 dGZxECvAfihIgXQJvjo/HzGSyqAE3zZBiPGo9FuvQVB2XfyuC0N9EW+23rU8zepT Dlj+c5qJMxSq7XpjErn4AbP0ZkSiH9PuT/ZpCKE/cKYQeyLEJBcclQxaavmfpdmB 8Pm+kAU0hTGqP2fVg65YTFSxQ3ySHj8JKEApMKyIVTPQJ7eifu10/dw6J6V/j2hY aAxu58G6L0tR/3SNgEVKc7fjbvx0t4sLcCxiiqXFyW89qKv7LT01BsaLwhTxEAg8 isVJO0sH2O2Mc1nRWkn+IwCurDh3p9oReTGznRJPKGlq2qey6LmMHxNXDFWbkCs= =reSR -----END PGP SIGNATURE----- ----------------------------------------------------------------------- --

1 0

[linux-merge]; annotated tag, v4.4-rc6, created. v4.4-rc6
by postmaster＠open-mesh.org 21 Dec '15

21 Dec '15

The annotated tag, v4.4-rc6 has been created at fac30e915cefbb5cb8aeeebfc614828a90b0293b (tag) tagging 4ef7675344d687a0ef5b0d7c0cee12da005870c0 (commit) replaces v4.4-rc5 tagged by Linus Torvalds on Sun Dec 20 16:06:19 2015 -0800 - Shortlog ------------------------------------------------------------ Linux 4.4-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJWd0J7AAoJEHm+PkMAQRiGm+cIAIWUlh9PQY5nH2C8Jta4HyTq u/MNLCoKM1LUjG7ZBryFxFG3X6BBMpfzUF011Nv5XC7oQj845dYxWK6f+lIKTq6N 8KsQkVrSv5SJ48o5Vj/ZTTrNt4rN54l0Camuwk8YXdtq6r6FSGzEkn33PQvQArAz z3Jln+dZod7NE7QhQqZHbTKvQTNuG0dkV/sEHHW4OoMo5Ag4KutZtlheQc9XdM9F jz0uEu4Nc3yHQM+DpuQ5qp3wSsUXoqcYRbsdpxwdeGgWXPqbkNBVgwlr68RsjQ0g HqIn2Bln7mJvJ7iZCWvniMHVrYHOPKceHjOsYgXRDUEav/2mA7Dyjj6ttbmNuOg= =5AQv -----END PGP SIGNATURE----- Marek Lindner (1): batman-adv: fix erroneous client entry duplicate detection Simon Wunderlich (2): batman-adv: fix speedy join for DAT cache replies batman-adv: avoid keeping false temporary entry Sven Eckelmann (1): batman-adv: Fix invalid stack access in batadv_dat_select_candidates ----------------------------------------------------------------------- --

1 0

[batman-adv-doc] master: batman-adv-doc: Fix external links (9416608)
by postmaster＠open-mesh.org 18 Dec '15

18 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv-doc On branch : master >--------------------------------------------------------------- commit 94166086c7e29a95e2db03c5b57b8665f16d61cb Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 6 16:28:25 2015 +0100 batman-adv-doc: Fix external links Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 94166086c7e29a95e2db03c5b57b8665f16d61cb README | 20 ++++++++++---------- batmand.docbook | 4 ++-- copyright.docbook | 2 +- references.docbook | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README b/README index 8f4ff7d..59ebe63 100644 --- a/README +++ b/README @@ -1,18 +1,18 @@ Requirements ============ - * GNU make - http://www.gnu.org/software/make/ + * GNU make - https://www.gnu.org/software/make/ * xmlto - https://fedorahosted.org/xmlto/ - * docbook-xml (>= 4.5) - http://www.oasis-open.org/docbook/xml/ - * docbook-xsl - http://wiki.docbook.org/topic/DocBookXslStylesheets - * fop - http://xmlgraphics.apache.org/fop/ + * docbook-xml (>= 4.5) - https://www.oasis-open.org/docbook/xml/ + * docbook-xsl - http://wiki.docbook.org/DocBookXslStylesheets + * fop - https://xmlgraphics.apache.org/fop/ * ghostscript - http://www.ghostscript.com/ - * coreutils - http://www.gnu.org/software/coreutils/ + * coreutils - https://www.gnu.org/software/coreutils/coreutils.html * gnuplot - http://gnuplot.sourceforge.net/ - * dia - http://live.gnome.org/Dia - * texlive-latex-base - http://www.tug.org/texlive/ - * texlive-base - http://www.tug.org/texlive/ - * ps2eps - http://www.tm.uka.de/~bless/ps2eps + * dia - https://wiki.gnome.org/action/show/Apps/Dia + * texlive-latex-base - https://www.tug.org/texlive/ + * texlive-base - https://www.tug.org/texlive/ + * ps2eps - https://www.tm.uka.de/~bless/ps2eps * imagemagick - http://www.imagemagick.org/ @@ -31,4 +31,4 @@ Troubleshooting * "libjli.so: cannot open shared object file: No such file or directory" Make sure that /proc is mounted and `/bin/ls -l /proc/self/exe` prints [...] /proc/self/exe -> /bin/ls - See http://bugs.debian.org/435293 for more informations + See https://bugs.debian.org/435293 for more informations diff --git a/batmand.docbook b/batmand.docbook index 9f6c68b..350e9ed 100644 --- a/batmand.docbook +++ b/batmand.docbook @@ -18,7 +18,7 @@ <listitem><para>libpthread</para></listitem> </orderedlist></listitem> <listitem><para>Download the B.A.T.M.A.N. daemon code from the website - <ulink url="http://www.open-mesh.net/wiki/Download" /></para></listitem> + <ulink url="https://www.open-mesh.org/projects/open-mesh/wiki/Download" /></para></listitem> </itemizedlist> </section> <section> @@ -26,7 +26,7 @@ <para>All you have to do is untar and make, then you will see the executable file called <emphasis>batmand</emphasis>.</para> <programlisting><userinput>$ wget \ -http://downloads.open-mesh.net/batman/stable/sources/batman/batman-0.3.tar.gz +https://downloads.open-mesh.org/batman/stable/sources/batman/batman-0.3.tar.gz $ tar xzvf batman-0.3.tar.gz $ cd batman-0.3 $ make</userinput></programlisting> diff --git a/copyright.docbook b/copyright.docbook index 4ec2dff..1cf1d6a 100644 --- a/copyright.docbook +++ b/copyright.docbook @@ -5,6 +5,6 @@ you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. To view a copy of this - license, visit <ulink url="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" /> or write to the Free Software Foundation, Inc., 51 Franklin + license, visit <ulink url="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" /> or write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</para> </chapter> diff --git a/references.docbook b/references.docbook index 0cd65d3..0cce1d4 100644 --- a/references.docbook +++ b/references.docbook @@ -2,7 +2,7 @@ <section> <title>Reference Links</title> <itemizedlist> - <listitem><ulink url="http://www.open-mesh.net/" /></listitem> + <listitem><ulink url="https://www.open-mesh.org/" /></listitem> <listitem><ulink url="http://www.olsr.org/" /></listitem> </itemizedlist> </section>

1 0

[batman-adv] master: batman-adv: Switch to HTTPS version of links (5fe476a)
by postmaster＠open-mesh.org 18 Dec '15

18 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 5fe476ab3a5e03b3273e640f2fea169f94ff0687 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 6 16:15:07 2015 +0100 batman-adv: Switch to HTTPS version of links open-mesh.org and its subdomains can only be accessed via HTTPS. HTTP-only requests are currently redirected automatically to HTTPS but references in the source code should be only https. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 5fe476ab3a5e03b3273e640f2fea169f94ff0687 Documentation/networking/batman-adv.txt | 2 +- net/batman-adv/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt index ff23b75..1b5e7a7 100644 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@ -187,7 +187,7 @@ interfaces to the kernel module settings. For more information, please see the manpage (man batctl). -batctl is available on http://www.open-mesh.org/ +batctl is available on https://www.open-mesh.org/ CONTACT diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index c6fc8f7..2dd40e5 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -12,7 +12,7 @@ config BATMAN_ADV B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a routing protocol for multi-hop ad-hoc mesh networks. The networks may be wired or wireless. See - http://www.open-mesh.org/ for more information and user space + https://www.open-mesh.org/ for more information and user space tools. config BATMAN_ADV_BLA

1 0

[batman-adv] master: Merge branch 'next' (770d7c1)
by postmaster＠open-mesh.org 18 Dec '15

18 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 770d7c1e9eb45858bae0f2463bbd68aed659b368 Merge: 1a19216 0e92483 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Dec 18 22:16:11 2015 +0800 Merge branch 'next' >--------------------------------------------------------------- 770d7c1e9eb45858bae0f2463bbd68aed659b368 Documentation/ABI/testing/sysfs-class-net-mesh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (770d7c1)
by postmaster＠open-mesh.org 18 Dec '15

18 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 0e92483 batman-adv: update email address 770d7c1 Merge branch 'next'

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2015