B.A.T.M.A.N August 2020

b.a.t.m.a.n@lists.open-mesh.org

17 participants
18 discussions

[PATCH v2] batman-adv: Migrate to linux/prandom.h
by Sven Eckelmann 17 Aug '20

17 Aug '20

The commit c0842fbc1b18 ("random32: move the pseudo-random 32-bit definitions to prandom.h") introduced a new header for the pseudo random functions from (previously) linux/random.h. One future goal of the prandom.h change is to make code to switch just the new header file and to avoid the implicit include. This would allow the removal of the implicit include from random.h Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: - handle stable kernels in compat code compat-include/linux/prandom.h | 24 ++++++++++++++++++++++++ net/batman-adv/bat_iv_ogm.c | 1 + net/batman-adv/bat_v_elp.c | 1 + net/batman-adv/bat_v_ogm.c | 1 + net/batman-adv/network-coding.c | 2 +- 5 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 compat-include/linux/prandom.h diff --git a/compat-include/linux/prandom.h b/compat-include/linux/prandom.h new file mode 100644 index 00000000..2863a57d --- /dev/null +++ b/compat-include/linux/prandom.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ + +#include <linux/version.h> +#if LINUX_VERSION_IS_GEQ(5, 8, 1) || \ + (LINUX_VERSION_IS_GEQ(4, 14, 193) && LINUX_VERSION_IS_LESS(4, 15, 0)) || \ + (LINUX_VERSION_IS_GEQ(4, 19, 138) && LINUX_VERSION_IS_LESS(4, 20, 0)) || \ + (LINUX_VERSION_IS_GEQ(5, 4, 57) && LINUX_VERSION_IS_LESS(5, 5, 0)) || \ + (LINUX_VERSION_IS_GEQ(5, 7, 14) && LINUX_VERSION_IS_LESS(5, 8, 0)) +#include_next <linux/prandom.h> +#else +#include <linux/random.h> +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ */ diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index a4faf5f9..206d0b42 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -27,6 +27,7 @@ #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/pkt_sched.h> +#include <linux/prandom.h> #include <linux/printk.h> #include <linux/random.h> #include <linux/rculist.h> diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index d35aca0e..79a7dfc3 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -20,6 +20,7 @@ #include <linux/kref.h> #include <linux/netdevice.h> #include <linux/nl80211.h> +#include <linux/prandom.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 717fe657..8c1148fc 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -20,6 +20,7 @@ #include <linux/lockdep.h> #include <linux/mutex.h> #include <linux/netdevice.h> +#include <linux/prandom.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 64619b7a..61ddd6d7 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -26,8 +26,8 @@ #include <linux/lockdep.h> #include <linux/net.h> #include <linux/netdevice.h> +#include <linux/prandom.h> #include <linux/printk.h> -#include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/seq_file.h> -- 2.20.1

1 0

[PATCH] batman-adv: Migrate to linux/prandom.h
by Sven Eckelmann 17 Aug '20

17 Aug '20

The commit c0842fbc1b18 ("random32: move the pseudo-random 32-bit definitions to prandom.h") introduced a new header for the pseudo random functions from (previously) linux/random.h. One future goal of the prandom.h change is to make code to switch just the new header file and to avoid the implicit include. This would allow the removal of the implicit include from random.h Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- compat-include/linux/prandom.h | 20 ++++++++++++++++++++ net/batman-adv/bat_iv_ogm.c | 1 + net/batman-adv/bat_v_elp.c | 1 + net/batman-adv/bat_v_ogm.c | 1 + net/batman-adv/network-coding.c | 2 +- 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 compat-include/linux/prandom.h diff --git a/compat-include/linux/prandom.h b/compat-include/linux/prandom.h new file mode 100644 index 00000000..6280957e --- /dev/null +++ b/compat-include/linux/prandom.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ + +#include <linux/version.h> +#if LINUX_VERSION_IS_GEQ(5, 9, 0) +#include_next <linux/prandom.h> +#else +#include <linux/random.h> +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ */ diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index a4faf5f9..206d0b42 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -27,6 +27,7 @@ #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/pkt_sched.h> +#include <linux/prandom.h> #include <linux/printk.h> #include <linux/random.h> #include <linux/rculist.h> diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index d35aca0e..79a7dfc3 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -20,6 +20,7 @@ #include <linux/kref.h> #include <linux/netdevice.h> #include <linux/nl80211.h> +#include <linux/prandom.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 717fe657..8c1148fc 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -20,6 +20,7 @@ #include <linux/lockdep.h> #include <linux/mutex.h> #include <linux/netdevice.h> +#include <linux/prandom.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 64619b7a..61ddd6d7 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -26,8 +26,8 @@ #include <linux/lockdep.h> #include <linux/net.h> #include <linux/netdevice.h> +#include <linux/prandom.h> #include <linux/printk.h> -#include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/seq_file.h> -- 2.20.1

1 0

Re: Scientific research
by Sven Eckelmann 16 Aug '20

16 Aug '20

Hi, to be honest, the documentation needs an overhaul. There were some ideas to move it to sphinx and to have a more coherent structure. I've started with the conversion to restructuredText [1] some years ago but the person interested(?) in doing more work on the documentation in sphinx didn't continue the work. Maybe I have to lure Linus and Simon with some ice cream and discuss some ideas with them. On Wednesday, 5 August 2020 15:35:44 CEST Venceslas Ngounou via B.A.T.M.A.N wrote: > - An up to date documentation on Echo Location Protocol (ELP). On open-mesh.org, the dedicated page has the mention OUTDATED. Yes, I've added the "outdated" because this documentation describes some ideas various people had. But they were not synced when the actual protocol was implemented. Things (most likely not complete) which don't line up: * actual packet format is completely wrong * not neighbors are announced but the "own" originator * padding is not used for broadcast ELPs * unicast ELPs are completely valid (for rate control probe packets) Would be nice if the page could be checked and fixed by someone more familiar with ELP. > - An up to date documentation on the different packet types What do you have in mind here? Best documentation for the actual binary format is the uapi file batadv_packet.h [2] > - Scientific papers (if any) related to the design or the modeling of the actuel version of BATMAN-adv. Since batman-adv was never a traditional academic project, there were no papers written about it by the original authors during the development. But there are two pages with pointers to various papers [3,4] but there weren't updated in the last 3 years. So you might find more interesting things on Google Scholar [5]. Kind regards, Sven [1] https://git.open-mesh.org/doc.git [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/inc… [3] https://www.open-mesh.org/projects/open-mesh/wiki/Experience#Papers [4] https://www.open-mesh.org/projects/open-mesh/wiki/New_papers [5] https://scholar.google.com/scholar?q=batman-adv

1 0

KMSAN: uninit-value in batadv_hard_if_event (2)
by syzbot 13 Aug '20

13 Aug '20

Hello, syzbot found the following issue on: HEAD commit: ce8056d1 wip: changed copy_from_user where instrumented git tree: https://github.com/google/kmsan.git master console output: https://syzkaller.appspot.com/x/log.txt?x=106e4c3c900000 kernel config: https://syzkaller.appspot.com/x/.config?x=3afe005fb99591f dashboard link: https://syzkaller.appspot.com/bug?extid=abbc768b560c84d92fd3 compiler: clang version 10.0.0 (https://github.com/llvm/llvm-project/ c2443155a0fb245c8f17f2c1c72b6ea391e86e81) userspace arch: i386 Unfortunately, I don't have any reproducer for this issue yet. IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+abbc768b560c84d92fd3(a)syzkaller.appspotmail.com usb 1-1: config 0 descriptor?? ===================================================== BUG: KMSAN: uninit-value in batadv_check_known_mac_addr net/batman-adv/hard-interface.c:512 [inline] BUG: KMSAN: uninit-value in batadv_hardif_add_interface net/batman-adv/hard-interface.c:944 [inline] BUG: KMSAN: uninit-value in batadv_hard_if_event+0x28d7/0x3bd0 net/batman-adv/hard-interface.c:1034 CPU: 0 PID: 8697 Comm: kworker/0:3 Not tainted 5.8.0-rc5-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: usb_hub_wq hub_event Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x21c/0x280 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:121 __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215 batadv_check_known_mac_addr net/batman-adv/hard-interface.c:512 [inline] batadv_hardif_add_interface net/batman-adv/hard-interface.c:944 [inline] batadv_hard_if_event+0x28d7/0x3bd0 net/batman-adv/hard-interface.c:1034 notifier_call_chain kernel/notifier.c:83 [inline] __raw_notifier_call_chain kernel/notifier.c:361 [inline] raw_notifier_call_chain+0x123/0x290 kernel/notifier.c:368 call_netdevice_notifiers_info net/core/dev.c:2027 [inline] call_netdevice_notifiers_extack net/core/dev.c:2039 [inline] call_netdevice_notifiers net/core/dev.c:2053 [inline] register_netdevice+0x3120/0x37d0 net/core/dev.c:9545 register_netdev+0xbe/0x100 net/core/dev.c:9645 rtl8150_probe+0x12d9/0x15b0 drivers/net/usb/rtl8150.c:916 usb_probe_interface+0xece/0x1550 drivers/usb/core/driver.c:374 really_probe+0xf20/0x20b0 drivers/base/dd.c:529 driver_probe_device+0x293/0x390 drivers/base/dd.c:701 __device_attach_driver+0x63f/0x830 drivers/base/dd.c:807 bus_for_each_drv+0x2ca/0x3f0 drivers/base/bus.c:431 __device_attach+0x4e2/0x7f0 drivers/base/dd.c:873 device_initial_probe+0x4a/0x60 drivers/base/dd.c:920 bus_probe_device+0x177/0x3d0 drivers/base/bus.c:491 device_add+0x3b0e/0x40d0 drivers/base/core.c:2680 usb_set_configuration+0x380f/0x3f10 drivers/usb/core/message.c:2032 usb_generic_driver_probe+0x138/0x300 drivers/usb/core/generic.c:241 usb_probe_device+0x311/0x490 drivers/usb/core/driver.c:272 really_probe+0xf20/0x20b0 drivers/base/dd.c:529 driver_probe_device+0x293/0x390 drivers/base/dd.c:701 __device_attach_driver+0x63f/0x830 drivers/base/dd.c:807 bus_for_each_drv+0x2ca/0x3f0 drivers/base/bus.c:431 __device_attach+0x4e2/0x7f0 drivers/base/dd.c:873 device_initial_probe+0x4a/0x60 drivers/base/dd.c:920 bus_probe_device+0x177/0x3d0 drivers/base/bus.c:491 device_add+0x3b0e/0x40d0 drivers/base/core.c:2680 usb_new_device+0x1bd4/0x2a30 drivers/usb/core/hub.c:2554 hub_port_connect drivers/usb/core/hub.c:5208 [inline] hub_port_connect_change drivers/usb/core/hub.c:5348 [inline] port_event drivers/usb/core/hub.c:5494 [inline] hub_event+0x5e7b/0x8a70 drivers/usb/core/hub.c:5576 process_one_work+0x1688/0x2140 kernel/workqueue.c:2269 worker_thread+0x10bc/0x2730 kernel/workqueue.c:2415 kthread+0x551/0x590 kernel/kthread.c:292 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:293 Uninit was stored to memory at: kmsan_save_stack_with_flags mm/kmsan/kmsan.c:144 [inline] kmsan_internal_chain_origin+0xad/0x130 mm/kmsan/kmsan.c:310 kmsan_memcpy_memmove_metadata+0x272/0x2e0 mm/kmsan/kmsan.c:247 kmsan_memcpy_metadata+0xb/0x10 mm/kmsan/kmsan.c:267 __msan_memcpy+0x43/0x50 mm/kmsan/kmsan_instr.c:116 set_ethernet_addr drivers/net/usb/rtl8150.c:282 [inline] rtl8150_probe+0x1236/0x15b0 drivers/net/usb/rtl8150.c:912 usb_probe_interface+0xece/0x1550 drivers/usb/core/driver.c:374 really_probe+0xf20/0x20b0 drivers/base/dd.c:529 driver_probe_device+0x293/0x390 drivers/base/dd.c:701 __device_attach_driver+0x63f/0x830 drivers/base/dd.c:807 bus_for_each_drv+0x2ca/0x3f0 drivers/base/bus.c:431 __device_attach+0x4e2/0x7f0 drivers/base/dd.c:873 device_initial_probe+0x4a/0x60 drivers/base/dd.c:920 bus_probe_device+0x177/0x3d0 drivers/base/bus.c:491 device_add+0x3b0e/0x40d0 drivers/base/core.c:2680 usb_set_configuration+0x380f/0x3f10 drivers/usb/core/message.c:2032 usb_generic_driver_probe+0x138/0x300 drivers/usb/core/generic.c:241 usb_probe_device+0x311/0x490 drivers/usb/core/driver.c:272 really_probe+0xf20/0x20b0 drivers/base/dd.c:529 driver_probe_device+0x293/0x390 drivers/base/dd.c:701 __device_attach_driver+0x63f/0x830 drivers/base/dd.c:807 bus_for_each_drv+0x2ca/0x3f0 drivers/base/bus.c:431 __device_attach+0x4e2/0x7f0 drivers/base/dd.c:873 device_initial_probe+0x4a/0x60 drivers/base/dd.c:920 bus_probe_device+0x177/0x3d0 drivers/base/bus.c:491 device_add+0x3b0e/0x40d0 drivers/base/core.c:2680 usb_new_device+0x1bd4/0x2a30 drivers/usb/core/hub.c:2554 hub_port_connect drivers/usb/core/hub.c:5208 [inline] hub_port_connect_change drivers/usb/core/hub.c:5348 [inline] port_event drivers/usb/core/hub.c:5494 [inline] hub_event+0x5e7b/0x8a70 drivers/usb/core/hub.c:5576 process_one_work+0x1688/0x2140 kernel/workqueue.c:2269 worker_thread+0x10bc/0x2730 kernel/workqueue.c:2415 kthread+0x551/0x590 kernel/kthread.c:292 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:293 Local variable ----node_id.i@rtl8150_probe created at: get_registers drivers/net/usb/rtl8150.c:911 [inline] set_ethernet_addr drivers/net/usb/rtl8150.c:281 [inline] rtl8150_probe+0xea7/0x15b0 drivers/net/usb/rtl8150.c:912 get_registers drivers/net/usb/rtl8150.c:911 [inline] set_ethernet_addr drivers/net/usb/rtl8150.c:281 [inline] rtl8150_probe+0xea7/0x15b0 drivers/net/usb/rtl8150.c:912 ===================================================== --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot.

1 1

Scientific research
by Venceslas Ngounou 05 Aug '20

05 Aug '20

Hi everyone, I went through online documentation on open-mesh.org and I have found many useful information. But there are some information I need. And I will be very glad if you could help me to have it. Please, I will mention few of them: - An up to date documentation on Echo Location Protocol (ELP). On open-mesh.org, the dedicated page has the mention OUTDATED. - An up to date documentation on the different packet types - Scientific papers (if any) related to the design or the modeling of the actuel version of BATMAN-adv. Thanks and Best regards, Venceslas.

1 0

Re: general protection fault in hci_phy_link_complete_evt
by syzbot 05 Aug '20

05 Aug '20

syzbot has bisected this issue to: commit b59abfbed638037f3b51eeb73266892cd2df177f Author: Johannes Berg <johannes.berg(a)intel.com> Date: Thu Sep 15 13:30:03 2016 +0000 mac80211_hwsim: statically initialize hwsim_radios list bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=15dd5f98900000 start commit: c0842fbc random32: move the pseudo-random 32-bit definitio.. git tree: upstream final oops: https://syzkaller.appspot.com/x/report.txt?x=17dd5f98900000 console output: https://syzkaller.appspot.com/x/log.txt?x=13dd5f98900000 kernel config: https://syzkaller.appspot.com/x/.config?x=cf567e8c7428377e dashboard link: https://syzkaller.appspot.com/bug?extid=18e38290a2a263b31aa0 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=17e4e094900000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1143e7ca900000 Reported-by: syzbot+18e38290a2a263b31aa0(a)syzkaller.appspotmail.com Fixes: b59abfbed638 ("mac80211_hwsim: statically initialize hwsim_radios list") For information about bisection process see: https://goo.gl/tpsmEJ#bisection

1 0

Re: general protection fault in hci_event_packet
by syzbot 04 Aug '20

04 Aug '20

syzbot has bisected this issue to: commit 941992d2944789641470626e9336d663236b1d28 Author: Javier Martinez Canillas <javier(a)osg.samsung.com> Date: Mon Sep 12 14:03:34 2016 +0000 ethernet: amd: use IS_ENABLED() instead of checking for built-in or module bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=155180c2900000 start commit: bcf87687 Linux 5.8 git tree: upstream final oops: https://syzkaller.appspot.com/x/report.txt?x=175180c2900000 console output: https://syzkaller.appspot.com/x/log.txt?x=135180c2900000 kernel config: https://syzkaller.appspot.com/x/.config?x=4b489d75d0c8859d dashboard link: https://syzkaller.appspot.com/bug?extid=0bef568258653cff272f syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1043af04900000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=12ca1dea900000 Reported-by: syzbot+0bef568258653cff272f(a)syzkaller.appspotmail.com Fixes: 941992d29447 ("ethernet: amd: use IS_ENABLED() instead of checking for built-in or module") For information about bisection process see: https://goo.gl/tpsmEJ#bisection

1 0

Re: KASAN: use-after-free Read in hci_send_acl
by syzbot 04 Aug '20

04 Aug '20

syzbot has bisected this issue to: commit 4ffcd582301bd020b1f9d00c55473af305ec19b5 Author: Michael Chan <michael.chan(a)broadcom.com> Date: Mon Sep 19 07:58:07 2016 +0000 bnxt_en: Pad TX packets below 52 bytes. bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=167b0f04900000 start commit: ac3a0c84 Merge git://git.kernel.org/pub/scm/linux/kernel/g.. git tree: upstream final oops: https://syzkaller.appspot.com/x/report.txt?x=157b0f04900000 console output: https://syzkaller.appspot.com/x/log.txt?x=117b0f04900000 kernel config: https://syzkaller.appspot.com/x/.config?x=c0cfcf935bcc94d2 dashboard link: https://syzkaller.appspot.com/bug?extid=98228e7407314d2d4ba2 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=152f1904900000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1482dfca900000 Reported-by: syzbot+98228e7407314d2d4ba2(a)syzkaller.appspotmail.com Fixes: 4ffcd582301b ("bnxt_en: Pad TX packets below 52 bytes.") For information about bisection process see: https://goo.gl/tpsmEJ#bisection

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N August 2020