commits October 2019

commits@lists.open-mesh.org

1 participants
54 discussions

[doc] backup-redmine/2019-10-12, master: doc: open-mesh/Emulation_Debug (c082ade)
by postmaster＠open-mesh.org 13 Oct '19

13 Oct '19

1 0

[doc] backup-redmine/2019-10-12, master: doc: open-mesh/Emulation_Debug (9a1fe2c)
by postmaster＠open-mesh.org 13 Oct '19

13 Oct '19

1 0

[doc] backup-redmine/2019-10-12, master: doc: open-mesh/Emulation_Debug (03a2586)
by postmaster＠open-mesh.org 13 Oct '19

13 Oct '19

1 0

[doc] backup-redmine/2019-10-12, master: doc: open-mesh/News-draft (c43f5e8)
by postmaster＠open-mesh.org 13 Oct '19

13 Oct '19

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2019-10-12,master >--------------------------------------------------------------- commit c43f5e8ce34e8dad2f16ef9fd6ad0f927ab293bb Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Oct 11 15:02:39 2019 +0000 doc: open-mesh/News-draft >--------------------------------------------------------------- c43f5e8ce34e8dad2f16ef9fd6ad0f927ab293bb open-mesh/News-draft.textile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/open-mesh/News-draft.textile b/open-mesh/News-draft.textile index fde622d..ba7e227 100644 --- a/open-mesh/News-draft.textile +++ b/open-mesh/News-draft.textile @@ -1,6 +1,6 @@ h1. DRAFT: Batman-adv 2019.4 released -Oct 8th, 2019. Today the B.A.T.M.A.N. team publishes the October 2019 update to batman-adv, batctl and alfred! The B.A.T.M.A.N. V implementation can now aggregate OGM2 messages into single messages before sending them out. As usual, this release also contains various bugfixes and code cleanups. +Oct 15th, 2019. Today the B.A.T.M.A.N. team publishes the October 2019 update to batman-adv, batctl and alfred! The B.A.T.M.A.N. V implementation can now aggregate OGM2 messages into single messages before sending them out. As usual, this release also contains various bugfixes and code cleanups. As the kernel module always depends on the Linux kernel it is compiled against, it does not make sense to provide binaries on our website. As usual, you will find the signed tarballs in our download section: @@ -22,7 +22,7 @@ h2. batman-adv <pre> $ git describe origin/master v2019.3-10-gbcadeaa3 -$ range=v2019.3..v2019.3-10-gbcadeaa3 +$ range=v2019.3..v2019.3-15-g888f60e5 $ git shortlog --email --no-merges "${range}" $ git log --no-merges "${range}"|grep -e '$Reported\|Tested\|Acked\|Reviewed-by\|Co-authored-by$-by'|sed 's/.*:/*/'|sort|uniq @@ -35,6 +35,8 @@ coding style cleanup/refactoring ================================ batman-adv: Replace usage of strlcpy with strscpy + batman-adv: Fix Kconfig indentation + batman-adv: netfilter: drop bridge nf reset from nf_reset BATMAN V ========= @@ -46,11 +48,13 @@ bugfixes ======== batman-adv: fix uninit-value in batadv_netlink_get_ifindex() + batman-adv: Avoid free/alloc race when handling OGM2 buffer + batman-adv: Avoid free/alloc race when handling OGM2 buffer -2019.4 (2019-10-08) +2019.4 (2019-10-15) =================== * support latest kernels (3.16 - 5.4) @@ -60,6 +64,7 @@ bugfixes - fix length validation in netlink messages - fix out of buffer read when parsing aggregated packets + - avoid race condition in OGM(2) packet modification and submission </pre> @@ -86,7 +91,7 @@ bugfix batctl: Fix deprecation warning for option '-m' -2019.4 (2019-10-08) +2019.4 (2019-10-15) =================== * fix deprecation warning for option '-m' @@ -107,7 +112,7 @@ Sven Eckelmann <sven(a)narfation.org> (2): alfred: vis: Fix ifindex check when registering interface -2019.4 (2019-10-08) +2019.4 (2019-10-15) =================== * fix build with musl

1 0

[doc] backup-redmine/2019-10-12, master: doc: open-mesh/Emulation_Debug: document usage of qemu gdb and linux gdb helper (31d21b8)
by postmaster＠open-mesh.org 13 Oct '19

13 Oct '19

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2019-10-12,master >--------------------------------------------------------------- commit 31d21b88a6a656ddc69e5bb2e45ee3f4455ef4ec Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Oct 11 23:30:52 2019 +0000 doc: open-mesh/Emulation_Debug: document usage of qemu gdb and linux gdb helper >--------------------------------------------------------------- 31d21b88a6a656ddc69e5bb2e45ee3f4455ef4ec open-mesh/Emulation_Debug.textile | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/open-mesh/Emulation_Debug.textile b/open-mesh/Emulation_Debug.textile index 31fc6ae..8457e77 100644 --- a/open-mesh/Emulation_Debug.textile +++ b/open-mesh/Emulation_Debug.textile @@ -301,7 +301,6 @@ chmod +x hub.sh The @SHARED_PATH@ in run.sh has to be changed to a valid path which is used to share the precompiled batman-adv.ko and other tools <pre> -cat > run.sh << "EOF" #! /bin/sh SHARED_PATH=/home/sven/tmp/qemu-batman/ @@ -309,10 +308,11 @@ SHARED_PATH=/home/sven/tmp/qemu-batman/ for i in `seq 1 5`; do qemu-img create -b debian.img -f qcow2 root.cow$i normalized_id=`echo "$i"|awk '{ printf "%02d\n",$1 }'` - screen qemu-system-x86_64 -enable-kvm -kernel linux-next/arch/x86/boot/bzImage -append "root=/dev/vda rw console=ttyS0" \ + screen qemu-system-x86_64 -enable-kvm -kernel linux-next/arch/x86/boot/bzImage -append "root=/dev/vda rw console=ttyS0 nokaslr" \ -smp 2 -m 512 -drive file=root.cow$i,if=virtio \ -netdev type=tap,id=net0,ifname=tap$i,script=no -device virtio-net-pci,mac=02:ba:de:af:fe:`echo $i|awk '{ printf "%02X", $1 }'`,netdev=net0 \ -virtfs local,path="${SHARED_PATH}",security_model=none,mount_tag=host \ + -gdb tcp:127.0.0.1:$((23000+$i)) \ -device virtio-rng-pci -nographic sleep 1 done @@ -378,3 +378,30 @@ mkfifo remote-dump ssh root(a)192.168.2.51 'tcpdump -i enp3s0 -s 0 -U -n -w - "port not 22"' > remote-dump wireshark -k -i remote-dump </pre> + +h2. Using KGDB + +The instances are listening on 127.0.0.1 TCP port <code>23000 + instance_no</code>. We will use in the following example instance 1. The gdb debugger can be started from the linux source directory and all <code>lx-*</code> helpers will be automatically be loaded. + +The debugging with gdb can be started from the linux-next directory: + +<pre> +$ gdb -iex "set auto-load safe-path scripts/gdb/" -ex 'target remote 127.0.0.1:23001' -ex c ./vmlinux +</pre> + +The module can now be loaded in the qemu instance. After that, we have to reload the symbol information via <code>lx-symbol</code> and can set any kind of breakpoints on the batman-adv module: + +<pre> +^C +Thread 1 received signal SIGINT, Interrupt. +default_idle () at arch/x86/kernel/process.c:581 +581 trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id()); +(gdb) lx-symbols /home/sven/tmp/qemu-batman/batman-adv/net/batman-adv/ +loading vmlinux +scanning for modules in /home/sven/tmp/qemu-batman/batman-adv/net/batman-adv/ +scanning for modules in /home/sven/tmp/qemu-batman/linux-next +loading @0xffffffffa0000000: /home/sven/tmp/qemu-batman/batman-adv/net/batman-adv//batman-adv.ko +(gdb) b batadv_iv_send_outstanding_bat_ogm_packet +Breakpoint 1 at 0xffffffffa0005d60: file /home/sven/tmp/qemu-batman/batman-adv/net/batman-adv/bat_iv_ogm.c, line 1692. +(gdb) c +</pre> \ No newline at end of file

1 0

[doc] backup-redmine/2019-10-12, master: doc: open-mesh/News-draft (61312dc)
by postmaster＠open-mesh.org 13 Oct '19

13 Oct '19

1 0

[doc] backup-redmine/2019-10-12, master: doc: open-mesh/News-draft (0dd5723)
by postmaster＠open-mesh.org 13 Oct '19

13 Oct '19

1 0

[doc] backup-redmine/2019-10-12, master: doc: open-mesh/News-draft (b1109a4)
by postmaster＠open-mesh.org 13 Oct '19

13 Oct '19

1 0

[batman-adv] maint's head updated: batman-adv: Avoid free/alloc race when handling OGM buffer (9b8ceef2)
by postmaster＠open-mesh.org 11 Oct '19

11 Oct '19

Repository : ssh://git@open-mesh.org/batman-adv Branch 'maint' now includes: 14ee2457 batman-adv: Avoid free/alloc race when handling OGM2 buffer 9b8ceef2 batman-adv: Avoid free/alloc race when handling OGM buffer

1 0

[batman-adv] master: batman-adv: Avoid free/alloc race when handling OGM2 buffer (14ee2457)
by postmaster＠open-mesh.org 11 Oct '19

11 Oct '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 14ee24576213ff02272b7f8d975c7c61d5448aa2 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 3 17:02:01 2019 +0200 batman-adv: Avoid free/alloc race when handling OGM2 buffer A B.A.T.M.A.N. V virtual interface has an OGM2 packet buffer which is initialized using data from the RTNL lock protected netdevice notifier and other rtnetlink related hooks. It is sent regularly via various slave interfaces of the batadv virtual interface and in this process also modified (realloced) to integrate additional state information via TVLV containers. It must be avoided that the worker item is executed without a common lock with the netdevice notifier/rtnetlink helpers. Otherwise it can either happen that half modified data is sent out or the functions modifying the OGM2 buffer try to access already freed memory regions. Fixes: 632835348e65 ("batman-adv: OGMv2 - add basic infrastructure") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 14ee24576213ff02272b7f8d975c7c61d5448aa2 net/batman-adv/bat_v_ogm.c | 32 +++++++++++++++++++++++++------- net/batman-adv/types.h | 4 ++-- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index bc06e3cd..034bdc5e 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -21,6 +21,7 @@ #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> +#include <linux/rtnetlink.h> #include <linux/skbuff.h> #include <linux/slab.h> #include <linux/stddef.h> @@ -116,14 +117,12 @@ static void batadv_v_ogm_send_to_if(struct sk_buff *skb, } /** - * batadv_v_ogm_send() - periodic worker broadcasting the own OGM - * @work: work queue item + * batadv_v_ogm_send_softif() - periodic worker broadcasting the own OGM + * @bat_priv: the bat priv with all the soft interface information */ -static void batadv_v_ogm_send(struct work_struct *work) +static void batadv_v_ogm_send_softif(struct batadv_priv *bat_priv) { struct batadv_hard_iface *hard_iface; - struct batadv_priv_bat_v *bat_v; - struct batadv_priv *bat_priv; struct batadv_ogm2_packet *ogm_packet; struct sk_buff *skb, *skb_tmp; unsigned char *ogm_buff; @@ -131,8 +130,7 @@ static void batadv_v_ogm_send(struct work_struct *work) u16 tvlv_len = 0; int ret; - bat_v = container_of(work, struct batadv_priv_bat_v, ogm_wq.work); - bat_priv = container_of(bat_v, struct batadv_priv, bat_v); + ASSERT_RTNL(); if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING) goto out; @@ -223,6 +221,22 @@ out: return; } +/** + * batadv_v_ogm_send() - periodic worker broadcasting the own OGM + * @work: work queue item + */ +static void batadv_v_ogm_send(struct work_struct *work) +{ + struct batadv_priv_bat_v *bat_v; + struct batadv_priv *bat_priv; + + rtnl_lock(); + bat_v = container_of(work, struct batadv_priv_bat_v, ogm_wq.work); + bat_priv = container_of(bat_v, struct batadv_priv, bat_v); + batadv_v_ogm_send_softif(bat_priv); + rtnl_unlock(); +} + /** * batadv_v_ogm_iface_enable() - prepare an interface for B.A.T.M.A.N. V * @hard_iface: the interface to prepare @@ -249,6 +263,8 @@ void batadv_v_ogm_primary_iface_set(struct batadv_hard_iface *primary_iface) struct batadv_priv *bat_priv = netdev_priv(primary_iface->soft_iface); struct batadv_ogm2_packet *ogm_packet; + ASSERT_RTNL(); + if (!bat_priv->bat_v.ogm_buff) return; @@ -857,6 +873,8 @@ int batadv_v_ogm_init(struct batadv_priv *bat_priv) unsigned char *ogm_buff; u32 random_seqno; + ASSERT_RTNL(); + bat_priv->bat_v.ogm_buff_len = BATADV_OGM2_HLEN; ogm_buff = kzalloc(bat_priv->bat_v.ogm_buff_len, GFP_ATOMIC); if (!ogm_buff) diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 6ae139d7..3eb3150e 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1518,10 +1518,10 @@ struct batadv_softif_vlan { * struct batadv_priv_bat_v - B.A.T.M.A.N. V per soft-interface private data */ struct batadv_priv_bat_v { - /** @ogm_buff: buffer holding the OGM packet */ + /** @ogm_buff: buffer holding the OGM packet. rtnl protected */ unsigned char *ogm_buff; - /** @ogm_buff_len: length of the OGM packet buffer */ + /** @ogm_buff_len: length of the OGM packet buffer. rtnl protected */ int ogm_buff_len; /** @ogm_seqno: OGM sequence number - used to identify each OGM */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2019