January 2020 - B.A.T.M.A.N - lists.open-mesh.org

by syzbot

Hello, syzbot found the following crash on: HEAD commit: 686a4f77 kmsan: don't compile memmove git tree: https://github.com/google/kmsan.git master console output: https://syzkaller.appspot.com/x/log.txt?x=10b1da4ee00000 kernel config: https://syzkaller.appspot.com/x/.config?x=e10654781bc1f11c dashboard link: https://syzkaller.appspot.com/bug?extid=37bad4f9cb2033876f32 compiler: clang version 10.0.0 (https://github.com/llvm/llvm-project/ c2443155a0fb245c8f17f2c1c72b6ea391e86e81) syz repro: https://syzkaller.appspot.com/x/repro.syz?x=102be0a1e00000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=123105a5e00000 IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+37bad4f9cb2033876f32(a)syzkaller.appspotmail.com ===================================================== BUG: KMSAN: uninit-value in batadv_bla_tx+0x2675/0x3730 net/batman-adv/bridge_loop_avoidance.c:1960 CPU: 0 PID: 9 Comm: ksoftirqd/0 Not tainted 5.5.0-rc5-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1c9/0x220 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:118 __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215 batadv_bla_tx+0x2675/0x3730 net/batman-adv/bridge_loop_avoidance.c:1960 batadv_interface_tx+0x67c/0x2450 net/batman-adv/soft-interface.c:239 __netdev_start_xmit include/linux/netdevice.h:4447 [inline] netdev_start_xmit include/linux/netdevice.h:4461 [inline] xmit_one net/core/dev.c:3420 [inline] dev_hard_start_xmit+0x531/0xab0 net/core/dev.c:3436 __dev_queue_xmit+0x37de/0x4220 net/core/dev.c:4013 dev_queue_xmit+0x4b/0x60 net/core/dev.c:4046 hsr_xmit net/hsr/hsr_forward.c:228 [inline] hsr_forward_do net/hsr/hsr_forward.c:285 [inline] hsr_forward_skb+0x2614/0x30d0 net/hsr/hsr_forward.c:361 hsr_handle_frame+0x385/0x4b0 net/hsr/hsr_slave.c:43 __netif_receive_skb_core+0x21de/0x5840 net/core/dev.c:5051 __netif_receive_skb_one_core net/core/dev.c:5148 [inline] __netif_receive_skb net/core/dev.c:5264 [inline] process_backlog+0x936/0x1410 net/core/dev.c:6095 napi_poll net/core/dev.c:6532 [inline] net_rx_action+0x786/0x1ab0 net/core/dev.c:6600 __do_softirq+0x311/0x83d kernel/softirq.c:293 run_ksoftirqd+0x25/0x40 kernel/softirq.c:607 smpboot_thread_fn+0x493/0x980 kernel/smpboot.c:165 kthread+0x4b5/0x4f0 kernel/kthread.c:256 ret_from_fork+0x35/0x40 arch/x86/entry/entry_64.S:353 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 pskb_expand_head+0x38b/0x1b00 net/core/skbuff.c:1637 __skb_pad+0x47f/0x900 net/core/skbuff.c:1805 __skb_put_padto include/linux/skbuff.h:3193 [inline] skb_put_padto include/linux/skbuff.h:3212 [inline] send_hsr_supervision_frame+0x122d/0x1500 net/hsr/hsr_device.c:310 hsr_announce+0x1e2/0x370 net/hsr/hsr_device.c:341 call_timer_fn+0x218/0x510 kernel/time/timer.c:1404 expire_timers kernel/time/timer.c:1449 [inline] __run_timers+0xcff/0x1210 kernel/time/timer.c:1773 run_timer_softirq+0x2d/0x50 kernel/time/timer.c:1786 __do_softirq+0x311/0x83d kernel/softirq.c:293 Uninit was created at: kmsan_save_stack_with_flags+0x3c/0x90 mm/kmsan/kmsan.c:144 kmsan_internal_alloc_meta_for_pages mm/kmsan/kmsan_shadow.c:307 [inline] kmsan_alloc_page+0x12a/0x310 mm/kmsan/kmsan_shadow.c:336 __alloc_pages_nodemask+0x57f2/0x5f60 mm/page_alloc.c:4800 __alloc_pages include/linux/gfp.h:498 [inline] __alloc_pages_node include/linux/gfp.h:511 [inline] alloc_pages_node include/linux/gfp.h:525 [inline] __page_frag_cache_refill mm/page_alloc.c:4875 [inline] page_frag_alloc+0x3ae/0x910 mm/page_alloc.c:4905 __napi_alloc_skb+0x193/0xa60 net/core/skbuff.c:519 napi_alloc_skb include/linux/skbuff.h:2825 [inline] page_to_skb+0x19f/0x1100 drivers/net/virtio_net.c:384 receive_mergeable drivers/net/virtio_net.c:924 [inline] receive_buf+0xe57/0x8ac0 drivers/net/virtio_net.c:1033 virtnet_receive drivers/net/virtio_net.c:1323 [inline] virtnet_poll+0x64b/0x19f0 drivers/net/virtio_net.c:1428 napi_poll net/core/dev.c:6532 [inline] net_rx_action+0x786/0x1ab0 net/core/dev.c:6600 __do_softirq+0x311/0x83d kernel/softirq.c:293 ===================================================== --- This bug 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 bug report. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. syzbot can test patches for this bug, for details see: https://goo.gl/tpsmEJ#testing-patches

2 years, 3 months

2
1
0 / 0

[PATCH] batman-adv: Drop workaround for Debian's make-kpkg

by Sven Eckelmann

The make-kpkg is a Debian specific tool to create a debian kernel package. It is not really maintained anymore and also not used to build the official Debian kernel packages. The correct way to have a kernel package under Debian is either to use the offical packages from the Debian main repository or to build them using the Linux make target deb-pkg. There is no reason to ship this workaround when Debian isn't even shipping make-kpkg with Debian buster and also not in the current Debian bullseye development snapshot. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- compat.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/compat.h b/compat.h index b915d914..21bacc5d 100644 --- a/compat.h +++ b/compat.h @@ -28,15 +28,6 @@ #endif /* LINUX_VERSION_IS_LESS(4, 3, 0) */ -#if LINUX_VERSION_IS_LESS(4, 6, 0) - -/* workaround for current issues with Debian's make-kpkg */ -#if LINUX_VERSION_IS_GEQ(4, 5, 0) -#include <uapi/linux/pkt_cls.h> -#endif - -#endif /* LINUX_VERSION_IS_LESS(4, 6, 0) */ - #if LINUX_VERSION_IS_LESS(4, 15, 0) #define batadv_softif_slave_add(__dev, __slave_dev, __extack) \ -- 2.20.1

2 years, 3 months

1
0
0 / 0

KMSAN: uninit-value in batadv_interface_tx (2)

by syzbot

Hello, syzbot found the following crash on: HEAD commit: 686a4f77 kmsan: don't compile memmove git tree: https://github.com/google/kmsan.git master console output: https://syzkaller.appspot.com/x/log.txt?x=11aff3c9e00000 kernel config: https://syzkaller.appspot.com/x/.config?x=e10654781bc1f11c dashboard link: https://syzkaller.appspot.com/bug?extid=24458cef7d37351dd0c3 compiler: clang version 10.0.0 (https://github.com/llvm/llvm-project/ c2443155a0fb245c8f17f2c1c72b6ea391e86e81) Unfortunately, I don't have any reproducer for this crash yet. IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+24458cef7d37351dd0c3(a)syzkaller.appspotmail.com ===================================================== BUG: KMSAN: uninit-value in batadv_interface_tx+0x10cf/0x2450 net/batman-adv/soft-interface.c:264 CPU: 1 PID: 16 Comm: ksoftirqd/1 Not tainted 5.5.0-rc5-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1c9/0x220 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:118 __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215 batadv_interface_tx+0x10cf/0x2450 net/batman-adv/soft-interface.c:264 __netdev_start_xmit include/linux/netdevice.h:4447 [inline] netdev_start_xmit include/linux/netdevice.h:4461 [inline] xmit_one net/core/dev.c:3420 [inline] dev_hard_start_xmit+0x531/0xab0 net/core/dev.c:3436 __dev_queue_xmit+0x37de/0x4220 net/core/dev.c:4013 dev_queue_xmit+0x4b/0x60 net/core/dev.c:4046 hsr_xmit net/hsr/hsr_forward.c:228 [inline] hsr_forward_do net/hsr/hsr_forward.c:285 [inline] hsr_forward_skb+0x2614/0x30d0 net/hsr/hsr_forward.c:361 hsr_handle_frame+0x385/0x4b0 net/hsr/hsr_slave.c:43 __netif_receive_skb_core+0x21de/0x5840 net/core/dev.c:5051 __netif_receive_skb_one_core net/core/dev.c:5148 [inline] __netif_receive_skb net/core/dev.c:5264 [inline] process_backlog+0x936/0x1410 net/core/dev.c:6095 napi_poll net/core/dev.c:6532 [inline] net_rx_action+0x786/0x1ab0 net/core/dev.c:6600 __do_softirq+0x311/0x83d kernel/softirq.c:293 run_ksoftirqd+0x25/0x40 kernel/softirq.c:607 smpboot_thread_fn+0x493/0x980 kernel/smpboot.c:165 kthread+0x4b5/0x4f0 kernel/kthread.c:256 ret_from_fork+0x35/0x40 arch/x86/entry/entry_64.S:353 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 pskb_expand_head+0x38b/0x1b00 net/core/skbuff.c:1637 __skb_pad+0x47f/0x900 net/core/skbuff.c:1805 __skb_put_padto include/linux/skbuff.h:3193 [inline] skb_put_padto include/linux/skbuff.h:3212 [inline] send_hsr_supervision_frame+0x122d/0x1500 net/hsr/hsr_device.c:310 hsr_announce+0x1e2/0x370 net/hsr/hsr_device.c:341 call_timer_fn+0x218/0x510 kernel/time/timer.c:1404 expire_timers kernel/time/timer.c:1449 [inline] __run_timers+0xcff/0x1210 kernel/time/timer.c:1773 run_timer_softirq+0x2d/0x50 kernel/time/timer.c:1786 __do_softirq+0x311/0x83d kernel/softirq.c:293 Uninit was created at: kmsan_save_stack_with_flags+0x3c/0x90 mm/kmsan/kmsan.c:144 kmsan_internal_alloc_meta_for_pages mm/kmsan/kmsan_shadow.c:307 [inline] kmsan_alloc_page+0x12a/0x310 mm/kmsan/kmsan_shadow.c:336 __alloc_pages_nodemask+0x57f2/0x5f60 mm/page_alloc.c:4800 __alloc_pages include/linux/gfp.h:498 [inline] __alloc_pages_node include/linux/gfp.h:511 [inline] alloc_pages_node include/linux/gfp.h:525 [inline] __page_frag_cache_refill mm/page_alloc.c:4875 [inline] page_frag_alloc+0x3ae/0x910 mm/page_alloc.c:4905 __netdev_alloc_skb+0x703/0xbb0 net/core/skbuff.c:455 __netdev_alloc_skb_ip_align include/linux/skbuff.h:2801 [inline] netdev_alloc_skb_ip_align include/linux/skbuff.h:2811 [inline] batadv_iv_ogm_aggregate_new net/batman-adv/bat_iv_ogm.c:558 [inline] batadv_iv_ogm_queue_add+0x10da/0x1900 net/batman-adv/bat_iv_ogm.c:670 batadv_iv_ogm_schedule_buff net/batman-adv/bat_iv_ogm.c:829 [inline] batadv_iv_ogm_schedule+0xcf1/0x13c0 net/batman-adv/bat_iv_ogm.c:865 batadv_iv_send_outstanding_bat_ogm_packet+0xbae/0xd50 net/batman-adv/bat_iv_ogm.c:1718 process_one_work+0x1552/0x1ef0 kernel/workqueue.c:2264 worker_thread+0xef6/0x2450 kernel/workqueue.c:2410 kthread+0x4b5/0x4f0 kernel/kthread.c:256 ret_from_fork+0x35/0x40 arch/x86/entry/entry_64.S:353 ===================================================== --- This bug 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 bug report. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot.

2 years, 3 months

2
1
0 / 0

Internet connection problem with Batman

by faycel.benhajkhalifa＠eisox.com

Hello, I saw that you are contributing to BATMAN, may I ask you a few questions about my installation? I have several boards with OpenWRT firmware: Mips processor Kernel version 4.14.131 OpenWRT 18.06.01 BATMAN: Batctl openwrt-2018.1-1 [batman-adv: openwrt-2018.1-8] I have 8 connected mesh boards. Internet connection on the boards is not always available. When a board no longer has an internet connection, I connect to another board and try the following commands: batctl o: I find the board in the table with last-seen <1 and a quality between 191 and 233 (good quality) batctl ping does not succeed every time ping with the OpenWRT ping command does not work If I restart the board which no longer has internet, then it reconnects to the network and accesses the internet without problem (functional pings) I tried with a Static or Dynamic IP, the result is the same. The internet connection works then is interrupted and I can't find why. And sometimes without restarting the board, it finds the internet OpenWRT Config: /etc/config/network config interface 'wan' option type 'bridge' option ifname 'eth0 bat0' option dns '8.8.8.8' option stp '1' option gateway '192.168.1.1' option netmask '255.255.255.0' option ipaddr '192.168.1.101' option proto 'static' /etc/config/wireless config wifi-iface 'wmesh' option device 'radio0' option ifname 'adhoc0' option mode 'adhoc' option network 'mesh' option encryption 'psk2' option ssid 'ssid' option bssid 'bssid' option key 'password' /etc/config/batman-adv config 'mesh' 'bat0' option 'aggregated_ogms' option 'ap_isolation' option 'bonding' option 'fragmentation' option 'gw_bandwidth' option 'gw_mode' option 'gw_sel_class' option 'log_level' option 'orig_interval' option 'bridge_loop_avoidance' option 'distributed_arp_table' option 'multicast_mode' option 'network_coding' option 'hop_penalty' 0 option 'isolation_mark and I added a patch in batman-adv/patches --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h --- 2 2019-07-15 17:26:55.717093662 +0200 +++ 1 2019-07-15 17:26:46.565093715 +0200 @@ -43,7 +43,7 @@ /* purge originators after time in seconds if no valid packet comes in * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE */ -#define BATADV_PURGE_TIMEOUT 200000 /* 200 seconds */ +#define BATADV_PURGE_TIMEOUT 10000 /* 10 seconds */ #define BATADV_TT_LOCAL_TIMEOUT 600000 /* in milliseconds */ #define BATADV_TT_CLIENT_ROAM_TIMEOUT 600000 /* in milliseconds */ #define BATADV_TT_CLIENT_TEMP_TIMEOUT 600000 /* in milliseconds */ The purpose of this patch is to make the network reconnect more quickly when a board being removed or added. Thanks for your help, I can provide more information about my network if you wish. Regards,

2 years, 3 months

2
1
0 / 0

[PATCH] batman-adv: compat: Fix build on RHEL 8.1 and clones

by Felix Kaechele

RHEL 8.1 backported some fixes from newer kernels so we need to treat it's 4.18 kernel as if it were a newer kernel in some cases. Signed-off-by: Felix Kaechele <felix(a)kaechele.ca> --- compat-include/linux/igmp.h | 2 +- compat-include/linux/uaccess.h | 2 +- compat-include/net/addrconf.h | 2 +- compat.h | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/compat-include/linux/igmp.h b/compat-include/linux/igmp.h index ecedc915..60606f05 100644 --- a/compat-include/linux/igmp.h +++ b/compat-include/linux/igmp.h @@ -17,7 +17,7 @@ int ip_mc_check_igmp(struct sk_buff *skb); -#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) +#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81) static inline int batadv_ip_mc_check_igmp(struct sk_buff *skb) { diff --git a/compat-include/linux/uaccess.h b/compat-include/linux/uaccess.h index e81ed805..5a337441 100644 --- a/compat-include/linux/uaccess.h +++ b/compat-include/linux/uaccess.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <linux/uaccess.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_81) static inline int batadv_access_ok(int type, const void __user *p, unsigned long size) diff --git a/compat-include/net/addrconf.h b/compat-include/net/addrconf.h index b826ee95..5ab19043 100644 --- a/compat-include/net/addrconf.h +++ b/compat-include/net/addrconf.h @@ -17,7 +17,7 @@ int ipv6_mc_check_mld(struct sk_buff *skb); -#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) +#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81) static inline int batadv_ipv6_mc_check_mld(struct sk_buff *skb) { diff --git a/compat.h b/compat.h index 980fca9f..7f4a5ee4 100644 --- a/compat.h +++ b/compat.h @@ -44,6 +44,12 @@ #endif /* < KERNEL_VERSION(4, 15, 0) */ +#ifdef RHEL_RELEASE_CODE +# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 1) +# define RHEL_81 +# endif +#endif /* RHEL_RELEASE_CODE */ + #endif /* __KERNEL__ */ #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ -- 2.24.1

2 years, 3 months

2
3
0 / 0

Re: KASAN: slab-out-of-bounds Read in bitmap_ipmac_destroy

by syzbot

syzbot has bisected this bug to: commit b9a1e627405d68d475a3c1f35e685ccfb5bbe668 Author: Cong Wang <xiyou.wangcong(a)gmail.com> Date: Thu Jul 4 00:21:13 2019 +0000 hsr: implement dellink to clean up resources bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=123fce01e00000 start commit: 4703d911 Merge tag 'xarray-5.5' of git://git.infradead.org.. git tree: upstream final crash: https://syzkaller.appspot.com/x/report.txt?x=113fce01e00000 console output: https://syzkaller.appspot.com/x/log.txt?x=163fce01e00000 kernel config: https://syzkaller.appspot.com/x/.config?x=83c00afca9cf5153 dashboard link: https://syzkaller.appspot.com/bug?extid=a85062dec5d65617cc1c syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1301ed85e00000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=14b7b79ee00000 Reported-by: syzbot+a85062dec5d65617cc1c(a)syzkaller.appspotmail.com Fixes: b9a1e627405d ("hsr: implement dellink to clean up resources") For information about bisection process see: https://goo.gl/tpsmEJ#bisection

2 years, 3 months

1
0
0 / 0

[PATCH AUTOSEL 4.4 1/9] batman-adv: Fix DAT candidate selection on little endian systems

by Sasha Levin

From: Sven Eckelmann <sven(a)narfation.org> [ Upstream commit 4cc4a1708903f404d2ca0dfde30e71e052c6cbc9 ] The distributed arp table is using a DHT to store and retrieve MAC address information for an IP address. This is done using unicast messages to selected peers. The potential peers are looked up using the IP address and the VID. While the IP address is always stored in big endian byte order, this is not the case of the VID. It can (depending on the host system) either be big endian or little endian. The host must therefore always convert it to big endian to ensure that all devices calculate the same peers for the same lookup data. Fixes: be1db4f6615b ("batman-adv: make the Distributed ARP Table vlan aware") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- net/batman-adv/distributed-arp-table.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index c2dff7c6e9607..76808c5e81836 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -226,6 +226,7 @@ static u32 batadv_hash_dat(const void *data, u32 size) u32 hash = 0; const struct batadv_dat_entry *dat = data; const unsigned char *key; + __be16 vid; u32 i; key = (const unsigned char *)&dat->ip; @@ -235,7 +236,8 @@ static u32 batadv_hash_dat(const void *data, u32 size) hash ^= (hash >> 6); } - key = (const unsigned char *)&dat->vid; + vid = htons(dat->vid); + key = (__force const unsigned char *)&vid; for (i = 0; i < sizeof(dat->vid); i++) { hash += key[i]; hash += (hash << 10); -- 2.20.1

2 years, 3 months

1
0
0 / 0

[PATCH AUTOSEL 4.9 01/18] batman-adv: Fix DAT candidate selection on little endian systems

by Sasha Levin

From: Sven Eckelmann <sven(a)narfation.org> [ Upstream commit 4cc4a1708903f404d2ca0dfde30e71e052c6cbc9 ] The distributed arp table is using a DHT to store and retrieve MAC address information for an IP address. This is done using unicast messages to selected peers. The potential peers are looked up using the IP address and the VID. While the IP address is always stored in big endian byte order, this is not the case of the VID. It can (depending on the host system) either be big endian or little endian. The host must therefore always convert it to big endian to ensure that all devices calculate the same peers for the same lookup data. Fixes: be1db4f6615b ("batman-adv: make the Distributed ARP Table vlan aware") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- net/batman-adv/distributed-arp-table.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index df7c6a0801885..3b440b8d7c052 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -242,6 +242,7 @@ static u32 batadv_hash_dat(const void *data, u32 size) u32 hash = 0; const struct batadv_dat_entry *dat = data; const unsigned char *key; + __be16 vid; u32 i; key = (const unsigned char *)&dat->ip; @@ -251,7 +252,8 @@ static u32 batadv_hash_dat(const void *data, u32 size) hash ^= (hash >> 6); } - key = (const unsigned char *)&dat->vid; + vid = htons(dat->vid); + key = (__force const unsigned char *)&vid; for (i = 0; i < sizeof(dat->vid); i++) { hash += key[i]; hash += (hash << 10); -- 2.20.1

2 years, 3 months

1
0
0 / 0

[PATCH AUTOSEL 4.14 01/32] batman-adv: Fix DAT candidate selection on little endian systems

by Sasha Levin

From: Sven Eckelmann <sven(a)narfation.org> [ Upstream commit 4cc4a1708903f404d2ca0dfde30e71e052c6cbc9 ] The distributed arp table is using a DHT to store and retrieve MAC address information for an IP address. This is done using unicast messages to selected peers. The potential peers are looked up using the IP address and the VID. While the IP address is always stored in big endian byte order, this is not the case of the VID. It can (depending on the host system) either be big endian or little endian. The host must therefore always convert it to big endian to ensure that all devices calculate the same peers for the same lookup data. Fixes: be1db4f6615b ("batman-adv: make the Distributed ARP Table vlan aware") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- net/batman-adv/distributed-arp-table.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 8d1d0fdb157e7..1519cbf70150b 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -243,6 +243,7 @@ static u32 batadv_hash_dat(const void *data, u32 size) u32 hash = 0; const struct batadv_dat_entry *dat = data; const unsigned char *key; + __be16 vid; u32 i; key = (const unsigned char *)&dat->ip; @@ -252,7 +253,8 @@ static u32 batadv_hash_dat(const void *data, u32 size) hash ^= (hash >> 6); } - key = (const unsigned char *)&dat->vid; + vid = htons(dat->vid); + key = (__force const unsigned char *)&vid; for (i = 0; i < sizeof(dat->vid); i++) { hash += key[i]; hash += (hash << 10); -- 2.20.1

2 years, 3 months

1
0
0 / 0

[PATCH AUTOSEL 4.19 01/56] batman-adv: Fix DAT candidate selection on little endian systems

by Sasha Levin

From: Sven Eckelmann <sven(a)narfation.org> [ Upstream commit 4cc4a1708903f404d2ca0dfde30e71e052c6cbc9 ] The distributed arp table is using a DHT to store and retrieve MAC address information for an IP address. This is done using unicast messages to selected peers. The potential peers are looked up using the IP address and the VID. While the IP address is always stored in big endian byte order, this is not the case of the VID. It can (depending on the host system) either be big endian or little endian. The host must therefore always convert it to big endian to ensure that all devices calculate the same peers for the same lookup data. Fixes: be1db4f6615b ("batman-adv: make the Distributed ARP Table vlan aware") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- net/batman-adv/distributed-arp-table.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 2895e3b26e930..f2dc7499d2663 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -251,6 +251,7 @@ static u32 batadv_hash_dat(const void *data, u32 size) u32 hash = 0; const struct batadv_dat_entry *dat = data; const unsigned char *key; + __be16 vid; u32 i; key = (const unsigned char *)&dat->ip; @@ -260,7 +261,8 @@ static u32 batadv_hash_dat(const void *data, u32 size) hash ^= (hash >> 6); } - key = (const unsigned char *)&dat->vid; + vid = htons(dat->vid); + key = (__force const unsigned char *)&vid; for (i = 0; i < sizeof(dat->vid); i++) { hash += key[i]; hash += (hash << 10); -- 2.20.1

2 years, 3 months

1
0
0 / 0

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N January 2020