B.A.T.M.A.N September 2020

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

23 participants
27 discussions

general protection fault in rt6_fill_node
by syzbot 11 Nov '20

11 Nov '20

Hello, syzbot found the following issue on: HEAD commit: d7223aa5 Merge branch 'l2tp-replace-custom-logging-code-wi.. git tree: net-next console output: https://syzkaller.appspot.com/x/log.txt?x=1399802e900000 kernel config: https://syzkaller.appspot.com/x/.config?x=3d400a47d1416652 dashboard link: https://syzkaller.appspot.com/bug?extid=81af6e9b3c4b8bc874f8 compiler: gcc (GCC) 10.1.0-syz 20200507 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=12949b5a900000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=17b60e46900000 The issue was bisected to: commit 867d03bc238f62fcd28f287b9da8af5e483baeab Author: Robert Hancock <hancock(a)sedsystems.ca> Date: Thu Jun 6 22:28:14 2019 +0000 net: axienet: Add DMA registers to ethtool register dump bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=1523f266900000 final oops: https://syzkaller.appspot.com/x/report.txt?x=1723f266900000 console output: https://syzkaller.appspot.com/x/log.txt?x=1323f266900000 IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+81af6e9b3c4b8bc874f8(a)syzkaller.appspotmail.com Fixes: 867d03bc238f ("net: axienet: Add DMA registers to ethtool register dump") IPv6: RTM_NEWROUTE with no NLM_F_CREATE or NLM_F_REPLACE IPv6: NLM_F_CREATE should be set when creating new route IPv6: NLM_F_CREATE should be set when creating new route general protection fault, probably for non-canonical address 0xdffffc0000000010: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000080-0x0000000000000087] CPU: 1 PID: 7050 Comm: syz-executor648 Not tainted 5.9.0-rc1-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:nexthop_is_blackhole include/net/nexthop.h:240 [inline] RIP: 0010:rt6_fill_node+0x1396/0x2940 net/ipv6/route.c:5584 Code: 3c 02 00 0f 85 ef 14 00 00 4d 8b 6d 10 e8 f2 1c 87 fa 49 8d bd 80 00 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 10 15 00 00 4d 8b ad 80 00 00 00 e8 34 4b 06 01 RSP: 0018:ffffc900063672b0 EFLAGS: 00010202 RAX: dffffc0000000000 RBX: ffff8880a88bd800 RCX: ffffffff86ed2456 RDX: 0000000000000010 RSI: ffffffff86ed248e RDI: 0000000000000080 RBP: ffffc900063673e8 R08: 0000000000000001 R09: ffff8880a88bd847 R10: 0000000000000001 R11: 0000000000000000 R12: ffff8880a8ded940 R13: 0000000000000000 R14: ffff8880a899ea00 R15: 0000000000000000 FS: 00000000010e3880(0000) GS:ffff8880ae700000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020000300 CR3: 00000000a8efa000 CR4: 00000000001506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: inet6_rt_notify+0x14c/0x2b0 net/ipv6/route.c:6017 fib6_add_rt2node net/ipv6/ip6_fib.c:1246 [inline] fib6_add+0x2840/0x3ed0 net/ipv6/ip6_fib.c:1473 __ip6_ins_rt net/ipv6/route.c:1317 [inline] ip6_route_add+0x8b/0x150 net/ipv6/route.c:3744 inet6_rtm_newroute+0x152/0x160 net/ipv6/route.c:5360 rtnetlink_rcv_msg+0x44e/0xad0 net/core/rtnetlink.c:5563 netlink_rcv_skb+0x15a/0x430 net/netlink/af_netlink.c:2470 netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline] netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1330 netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1919 sock_sendmsg_nosec net/socket.c:651 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:671 ____sys_sendmsg+0x6e8/0x810 net/socket.c:2353 ___sys_sendmsg+0xf3/0x170 net/socket.c:2407 __sys_sendmsg+0xe5/0x1b0 net/socket.c:2440 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x443ef9 Code: e8 8c 07 03 00 48 83 c4 18 c3 0f 1f 80 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 bb 09 fc ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007fff25138308 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 0000000000443ef9 RDX: 0000000000000000 RSI: 0000000020000300 RDI: 0000000000000003 RBP: 00007fff25138310 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 000000000000e25f R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 Modules linked in: ---[ end trace 46e9e8854602a8a3 ]--- RIP: 0010:nexthop_is_blackhole include/net/nexthop.h:240 [inline] RIP: 0010:rt6_fill_node+0x1396/0x2940 net/ipv6/route.c:5584 Code: 3c 02 00 0f 85 ef 14 00 00 4d 8b 6d 10 e8 f2 1c 87 fa 49 8d bd 80 00 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 10 15 00 00 4d 8b ad 80 00 00 00 e8 34 4b 06 01 RSP: 0018:ffffc900063672b0 EFLAGS: 00010202 RAX: dffffc0000000000 RBX: ffff8880a88bd800 RCX: ffffffff86ed2456 RDX: 0000000000000010 RSI: ffffffff86ed248e RDI: 0000000000000080 RBP: ffffc900063673e8 R08: 0000000000000001 R09: ffff8880a88bd847 R10: 0000000000000001 R11: 0000000000000000 R12: ffff8880a8ded940 R13: 0000000000000000 R14: ffff8880a899ea00 R15: 0000000000000000 FS: 00000000010e3880(0000) GS:ffff8880ae700000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020000300 CR3: 00000000a8efa000 CR4: 00000000001506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 --- 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. For information about bisection process see: https://goo.gl/tpsmEJ#bisection syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches

2 2

general protection fault in nexthop_is_blackhole
by syzbot 11 Nov '20

11 Nov '20

Hello, syzbot found the following issue on: HEAD commit: c3d8f220 Merge tag 'kbuild-fixes-v5.9' of git://git.kernel.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=11c48c96900000 kernel config: https://syzkaller.appspot.com/x/.config?x=bb68b9e8a8cc842f dashboard link: https://syzkaller.appspot.com/bug?extid=b2c08a2f5cfef635cc3a compiler: clang version 10.0.0 (https://github.com/llvm/llvm-project/ c2443155a0fb245c8f17f2c1c72b6ea391e86e81) syz repro: https://syzkaller.appspot.com/x/repro.syz?x=14d75e39900000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=12aea519900000 The issue was bisected to: commit de47c5d8e11dda678e4354eeb4235e58e92f7cd2 Author: Hariprasad Kelam <hariprasad.kelam(a)gmail.com> Date: Sat Jun 8 09:00:50 2019 +0000 af_key: make use of BUG_ON macro bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=10450972900000 final oops: https://syzkaller.appspot.com/x/report.txt?x=12450972900000 console output: https://syzkaller.appspot.com/x/log.txt?x=14450972900000 IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+b2c08a2f5cfef635cc3a(a)syzkaller.appspotmail.com Fixes: de47c5d8e11d ("af_key: make use of BUG_ON macro") IPv6: RTM_NEWROUTE with no NLM_F_CREATE or NLM_F_REPLACE IPv6: NLM_F_CREATE should be set when creating new route IPv6: NLM_F_CREATE should be set when creating new route general protection fault, probably for non-canonical address 0xdffffc0000000010: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000080-0x0000000000000087] CPU: 0 PID: 7050 Comm: syz-executor320 Not tainted 5.9.0-rc1-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:nexthop_is_blackhole+0x145/0x250 include/net/nexthop.h:240 Code: 4d fa 49 83 c6 10 4c 89 f0 48 c1 e8 03 42 80 3c 38 00 74 08 4c 89 f7 e8 39 f0 8c fa 49 8b 1e 48 83 eb 80 48 89 d8 48 c1 e8 03 <42> 80 3c 38 00 74 08 48 89 df e8 1c f0 8c fa 48 8b 1b e8 e4 4e 02 RSP: 0018:ffffc900061172b8 EFLAGS: 00010202 RAX: 0000000000000010 RBX: 0000000000000080 RCX: ffff888091444300 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000001 RBP: 0000000000000001 R08: ffffffff8727dfc7 R09: ffffed1012299e09 R10: ffffed1012299e09 R11: 0000000000000000 R12: dffffc0000000000 R13: ffff8880919da280 R14: ffff8880a9576610 R15: dffffc0000000000 FS: 0000000001a89880(0000) GS:ffff8880ae800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020000300 CR3: 00000000a7555000 CR4: 00000000001506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: rt6_fill_node+0xfe9/0x1f90 net/ipv6/route.c:5584 inet6_rt_notify+0x2ab/0x500 net/ipv6/route.c:6017 fib6_add_rt2node net/ipv6/ip6_fib.c:1246 [inline] fib6_add+0x203b/0x3bd0 net/ipv6/ip6_fib.c:1473 __ip6_ins_rt net/ipv6/route.c:1317 [inline] ip6_route_add+0x84/0x120 net/ipv6/route.c:3744 inet6_rtm_newroute+0x22f/0x2150 net/ipv6/route.c:5360 rtnetlink_rcv_msg+0x889/0xd40 net/core/rtnetlink.c:5563 netlink_rcv_skb+0x190/0x3a0 net/netlink/af_netlink.c:2470 netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline] netlink_unicast+0x786/0x940 net/netlink/af_netlink.c:1330 netlink_sendmsg+0xa57/0xd70 net/netlink/af_netlink.c:1919 sock_sendmsg_nosec net/socket.c:651 [inline] sock_sendmsg net/socket.c:671 [inline] ____sys_sendmsg+0x519/0x800 net/socket.c:2353 ___sys_sendmsg net/socket.c:2407 [inline] __sys_sendmsg+0x2b1/0x360 net/socket.c:2440 do_syscall_64+0x31/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x443ef9 Code: e8 8c 07 03 00 48 83 c4 18 c3 0f 1f 80 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 bb 09 fc ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007ffd64ccd428 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 0000000000443ef9 RDX: 0000000000000000 RSI: 0000000020000300 RDI: 0000000000000003 RBP: 00007ffd64ccd430 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 000000000000b6f1 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 Modules linked in: ---[ end trace e62dc7d3de715e59 ]--- RIP: 0010:nexthop_is_blackhole+0x145/0x250 include/net/nexthop.h:240 Code: 4d fa 49 83 c6 10 4c 89 f0 48 c1 e8 03 42 80 3c 38 00 74 08 4c 89 f7 e8 39 f0 8c fa 49 8b 1e 48 83 eb 80 48 89 d8 48 c1 e8 03 <42> 80 3c 38 00 74 08 48 89 df e8 1c f0 8c fa 48 8b 1b e8 e4 4e 02 RSP: 0018:ffffc900061172b8 EFLAGS: 00010202 RAX: 0000000000000010 RBX: 0000000000000080 RCX: ffff888091444300 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000001 RBP: 0000000000000001 R08: ffffffff8727dfc7 R09: ffffed1012299e09 R10: ffffed1012299e09 R11: 0000000000000000 R12: dffffc0000000000 R13: ffff8880919da280 R14: ffff8880a9576610 R15: dffffc0000000000 FS: 0000000001a89880(0000) GS:ffff8880ae800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020000300 CR3: 00000000a7555000 CR4: 00000000001506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 --- 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. For information about bisection process see: https://goo.gl/tpsmEJ#bisection syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches

2 2

INFO: rcu detected stall in exit_group
by syzbot 11 Nov '20

11 Nov '20

Hello, syzbot found the following issue on: HEAD commit: 34d4ddd3 Merge tag 'linux-kselftest-5.9-rc5' of git://git... git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=134173a5900000 kernel config: https://syzkaller.appspot.com/x/.config?x=a9075b36a6ae26c9 dashboard link: https://syzkaller.appspot.com/bug?extid=1a14a0f8ce1a06d4415f compiler: gcc (GCC) 10.1.0-syz 20200507 userspace arch: i386 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=10c6642d900000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=132d00fd900000 The issue was bisected to: commit 32021982a324dce93b4ae00c06213bf45fb319c8 Author: David Howells <dhowells(a)redhat.com> Date: Thu Nov 1 23:07:26 2018 +0000 hugetlbfs: Convert to fs_context bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=16cc40be900000 final oops: https://syzkaller.appspot.com/x/report.txt?x=15cc40be900000 console output: https://syzkaller.appspot.com/x/log.txt?x=11cc40be900000 IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+1a14a0f8ce1a06d4415f(a)syzkaller.appspotmail.com Fixes: 32021982a324 ("hugetlbfs: Convert to fs_context") rcu: INFO: rcu_preempt detected stalls on CPUs/tasks: rcu: Tasks blocked on level-0 rcu_node (CPUs 0-1): ------------[ cut here ]------------ WARNING: CPU: 0 PID: 3551 at kernel/sched/core.c:3013 rq_unlock kernel/sched/sched.h:1326 [inline] WARNING: CPU: 0 PID: 3551 at kernel/sched/core.c:3013 try_invoke_on_locked_down_task+0x214/0x2c0 kernel/sched/core.c:3019 Kernel panic - not syncing: panic_on_warn set ... CPU: 0 PID: 3551 Comm: syz-executor649 Not tainted 5.9.0-rc4-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: <IRQ> __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x198/0x1fd lib/dump_stack.c:118 panic+0x347/0x7c0 kernel/panic.c:231 __warn.cold+0x20/0x46 kernel/panic.c:600 report_bug+0x1bd/0x210 lib/bug.c:198 handle_bug+0x38/0x90 arch/x86/kernel/traps.c:234 exc_invalid_op+0x14/0x40 arch/x86/kernel/traps.c:254 asm_exc_invalid_op+0x12/0x20 arch/x86/include/asm/idtentry.h:536 RIP: 0010:try_invoke_on_locked_down_task+0x214/0x2c0 kernel/sched/core.c:3013 Code: 45 31 f6 49 39 c0 74 3a 8b 74 24 38 49 8d 78 18 4c 89 04 24 e8 ad 9a 08 00 4c 8b 04 24 4c 89 c7 e8 01 40 a6 06 e9 29 ff ff ff <0f> 0b e9 86 fe ff ff 4c 89 ee 48 89 ef 41 ff d4 41 89 c6 e9 11 ff RSP: 0018:ffffc90000007bd8 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 1ffff92000000f7d RCX: 0000000000000001 RDX: 0000000000000000 RSI: ffffffff81612ed0 RDI: ffff888099502240 RBP: ffff888099502240 R08: 0000000000000033 R09: ffffffff89bcb4a3 R10: 00000000000005a2 R11: 0000000000000001 R12: ffffffff81612ed0 R13: ffffc90000007d00 R14: ffff8880995025c0 R15: ffff8880ae636c00 rcu_print_task_stall kernel/rcu/tree_stall.h:267 [inline] print_other_cpu_stall kernel/rcu/tree_stall.h:475 [inline] check_cpu_stall kernel/rcu/tree_stall.h:634 [inline] rcu_pending kernel/rcu/tree.c:3637 [inline] rcu_sched_clock_irq.cold+0x92e/0xccd kernel/rcu/tree.c:2519 update_process_times+0x25/0xa0 kernel/time/timer.c:1710 tick_sched_handle+0x9b/0x180 kernel/time/tick-sched.c:176 tick_sched_timer+0x1d1/0x2a0 kernel/time/tick-sched.c:1328 __run_hrtimer kernel/time/hrtimer.c:1524 [inline] __hrtimer_run_queues+0x1d5/0xfc0 kernel/time/hrtimer.c:1588 hrtimer_interrupt+0x32a/0x930 kernel/time/hrtimer.c:1650 local_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1080 [inline] __sysvec_apic_timer_interrupt+0x142/0x5e0 arch/x86/kernel/apic/apic.c:1097 asm_call_on_stack+0xf/0x20 arch/x86/entry/entry_64.S:706 </IRQ> __run_on_irqstack arch/x86/include/asm/irq_stack.h:22 [inline] run_on_irqstack_cond arch/x86/include/asm/irq_stack.h:48 [inline] sysvec_apic_timer_interrupt+0xb2/0xf0 arch/x86/kernel/apic/apic.c:1091 asm_sysvec_apic_timer_interrupt+0x12/0x20 arch/x86/include/asm/idtentry.h:581 RIP: 0010:arch_local_irq_restore arch/x86/include/asm/paravirt.h:770 [inline] RIP: 0010:__raw_spin_unlock_irqrestore include/linux/spinlock_api_smp.h:160 [inline] RIP: 0010:_raw_spin_unlock_irqrestore+0x4d/0x90 kernel/locking/spinlock.c:191 Code: 48 c7 c0 48 3c b6 89 48 ba 00 00 00 00 00 fc ff df 48 c1 e8 03 80 3c 10 00 75 3c 48 83 3d 62 07 bf 01 00 74 29 48 89 df 57 9d <0f> 1f 44 00 00 bf 01 00 00 00 e8 44 80 58 f9 65 8b 05 7d c9 0a 78 RSP: 0018:ffffc9000c997a20 EFLAGS: 00000282 RAX: 1ffffffff136c789 RBX: 0000000000000282 RCX: 1ffffffff15645e9 RDX: dffffc0000000000 RSI: 0000000000000001 RDI: 0000000000000282 RBP: ffffffff8cb5e0e0 R08: 0000000000000001 R09: 0000000000000001 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000017 R13: 0000000000000017 R14: dead000000000100 R15: dffffc0000000000 __debug_check_no_obj_freed lib/debugobjects.c:977 [inline] debug_check_no_obj_freed+0x20c/0x41c lib/debugobjects.c:998 free_pages_prepare mm/page_alloc.c:1214 [inline] __free_pages_ok+0x240/0xcd0 mm/page_alloc.c:1471 release_pages+0x5ec/0x17a0 mm/swap.c:881 tlb_batch_pages_flush mm/mmu_gather.c:49 [inline] tlb_flush_mmu_free mm/mmu_gather.c:242 [inline] tlb_flush_mmu mm/mmu_gather.c:249 [inline] tlb_finish_mmu+0x165/0x8c0 mm/mmu_gather.c:328 exit_mmap+0x2d1/0x530 mm/mmap.c:3185 __mmput+0x122/0x470 kernel/fork.c:1076 mmput+0x53/0x60 kernel/fork.c:1097 exit_mm kernel/exit.c:483 [inline] do_exit+0xa8b/0x29f0 kernel/exit.c:793 do_group_exit+0x125/0x310 kernel/exit.c:903 __do_sys_exit_group kernel/exit.c:914 [inline] __se_sys_exit_group kernel/exit.c:912 [inline] __ia32_sys_exit_group+0x3a/0x50 kernel/exit.c:912 do_syscall_32_irqs_on arch/x86/entry/common.c:78 [inline] __do_fast_syscall_32+0x60/0x90 arch/x86/entry/common.c:137 do_fast_syscall_32+0x2f/0x70 arch/x86/entry/common.c:160 entry_SYSENTER_compat_after_hwframe+0x4d/0x5c RIP: 0023:0xf7f84549 Code: Bad RIP value. RSP: 002b:00000000ffd39f7c EFLAGS: 00000292 ORIG_RAX: 00000000000000fc RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00000000080ed2b8 RDX: 0000000000000000 RSI: 00000000080d6f3c RDI: 00000000080ed2c0 RBP: 0000000000000001 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 Shutting down cpus with NMI Kernel Offset: disabled Rebooting in 86400 seconds.. --- 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. For information about bisection process see: https://goo.gl/tpsmEJ#bisection syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches

2 2

INFO: rcu detected stall in security_file_open (3)
by syzbot 06 Nov '20

06 Nov '20

Hello, syzbot found the following issue on: HEAD commit: fb0155a0 Merge tag 'nfs-for-5.9-3' of git://git.linux-nfs... git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=10b007cf900000 kernel config: https://syzkaller.appspot.com/x/.config?x=41b736b7ce1b3ea4 dashboard link: https://syzkaller.appspot.com/bug?extid=d2b6e8cc299748fecf25 compiler: gcc (GCC) 10.1.0-syz 20200507 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1249c717900000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1048d9e3900000 The issue was bisected to: commit c9d8f5f0692d5960ed50970ffe63756fb8f96cdb Author: Kirill Tkhai <ktkhai(a)virtuozzo.com> Date: Fri Nov 9 10:33:27 2018 +0000 fuse: Protect fi->nlookup with fi->lock bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=11af769d900000 final oops: https://syzkaller.appspot.com/x/report.txt?x=13af769d900000 console output: https://syzkaller.appspot.com/x/log.txt?x=15af769d900000 IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+d2b6e8cc299748fecf25(a)syzkaller.appspotmail.com Fixes: c9d8f5f0692d ("fuse: Protect fi->nlookup with fi->lock") rcu: INFO: rcu_preempt detected stalls on CPUs/tasks: rcu: Tasks blocked on level-0 rcu_node (CPUs 0-1): ------------[ cut here ]------------ WARNING: CPU: 0 PID: 3922 at kernel/sched/core.c:3013 rq_unlock kernel/sched/sched.h:1326 [inline] WARNING: CPU: 0 PID: 3922 at kernel/sched/core.c:3013 try_invoke_on_locked_down_task+0x21d/0x2f0 kernel/sched/core.c:3019 Kernel panic - not syncing: panic_on_warn set ... CPU: 0 PID: 3922 Comm: systemd-udevd Not tainted 5.9.0-rc7-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: <IRQ> __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x198/0x1fd lib/dump_stack.c:118 panic+0x382/0x7fb kernel/panic.c:231 __warn.cold+0x20/0x4b kernel/panic.c:600 report_bug+0x1bd/0x210 lib/bug.c:198 handle_bug+0x38/0x90 arch/x86/kernel/traps.c:234 exc_invalid_op+0x14/0x40 arch/x86/kernel/traps.c:254 asm_exc_invalid_op+0x12/0x20 arch/x86/include/asm/idtentry.h:536 RIP: 0010:try_invoke_on_locked_down_task+0x21d/0x2f0 kernel/sched/core.c:3013 Code: 45 31 f6 49 39 c0 74 3a 8b 74 24 38 49 8d 78 18 4c 89 04 24 e8 a4 e7 08 00 4c 8b 04 24 4c 89 c7 e8 28 ab d6 06 e9 20 ff ff ff <0f> 0b e9 7d fe ff ff 4c 89 ee 48 89 ef 41 ff d4 41 89 c6 e9 08 ff RSP: 0018:ffffc90000007be0 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 1ffff92000000f7e RCX: 0000000000000001 RDX: 0000000000000000 RSI: ffffffff8162da10 RDI: ffff8880a61a2440 RBP: ffff8880a61a2440 R08: 0000000000000033 R09: ffffffff8a05ae03 R10: 000000000000062e R11: 0000000000000001 R12: ffffffff8162da10 R13: ffffc90000007d08 R14: ffff8880a61a2440 R15: 0000000000000000 rcu_print_task_stall kernel/rcu/tree_stall.h:267 [inline] print_other_cpu_stall kernel/rcu/tree_stall.h:475 [inline] check_cpu_stall kernel/rcu/tree_stall.h:634 [inline] rcu_pending kernel/rcu/tree.c:3639 [inline] rcu_sched_clock_irq.cold+0x97e/0xdfd kernel/rcu/tree.c:2521 update_process_times+0x25/0xa0 kernel/time/timer.c:1710 tick_sched_handle+0x9b/0x180 kernel/time/tick-sched.c:176 tick_sched_timer+0x1d1/0x2a0 kernel/time/tick-sched.c:1328 __run_hrtimer kernel/time/hrtimer.c:1524 [inline] __hrtimer_run_queues+0x1d5/0xfc0 kernel/time/hrtimer.c:1588 hrtimer_interrupt+0x334/0x940 kernel/time/hrtimer.c:1650 local_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1080 [inline] __sysvec_apic_timer_interrupt+0x147/0x5f0 arch/x86/kernel/apic/apic.c:1097 asm_call_irq_on_stack+0xf/0x20 </IRQ> __run_sysvec_on_irqstack arch/x86/include/asm/irq_stack.h:37 [inline] run_sysvec_on_irqstack_cond arch/x86/include/asm/irq_stack.h:89 [inline] sysvec_apic_timer_interrupt+0xb2/0xf0 arch/x86/kernel/apic/apic.c:1091 asm_sysvec_apic_timer_interrupt+0x12/0x20 arch/x86/include/asm/idtentry.h:581 RIP: 0010:preempt_count arch/x86/include/asm/preempt.h:26 [inline] RIP: 0010:check_kcov_mode kernel/kcov.c:163 [inline] RIP: 0010:__sanitizer_cov_trace_pc+0x9/0x60 kernel/kcov.c:197 Code: 5d be 03 00 00 00 e9 76 af 49 02 66 0f 1f 44 00 00 48 8b be b0 01 00 00 e8 b4 ff ff ff 31 c0 c3 90 65 48 8b 14 25 c0 fe 01 00 <65> 8b 05 e0 bf 8b 7e a9 00 01 ff 00 48 8b 34 24 74 0f f6 c4 01 74 RSP: 0018:ffffc90000f075a8 EFLAGS: 00000246 RAX: 0000000000000000 RBX: 0000000000000004 RCX: ffffffff838a0be7 RDX: ffff88809c62c4c0 RSI: ffff88809c62c4c0 RDI: 0000000000000005 RBP: ffff8880a601de80 R08: 0000000000000001 R09: ffffffff8d5f79c7 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000001 R13: 0000000000000183 R14: dffffc0000000000 R15: 0000000000000000 tomoyo_domain_quota_is_ok+0x31a/0x550 security/tomoyo/util.c:1070 tomoyo_supervisor+0x2f2/0xef0 security/tomoyo/common.c:2089 tomoyo_audit_path_log security/tomoyo/file.c:168 [inline] tomoyo_path_permission security/tomoyo/file.c:587 [inline] tomoyo_path_permission+0x270/0x3a0 security/tomoyo/file.c:573 tomoyo_check_open_permission+0x33e/0x380 security/tomoyo/file.c:777 tomoyo_file_open security/tomoyo/tomoyo.c:313 [inline] tomoyo_file_open+0xa3/0xd0 security/tomoyo/tomoyo.c:308 security_file_open+0x52/0x4f0 security/security.c:1574 do_dentry_open+0x358/0x11b0 fs/open.c:804 do_open fs/namei.c:3251 [inline] path_openat+0x1b9a/0x2730 fs/namei.c:3368 do_filp_open+0x17e/0x3c0 fs/namei.c:3395 do_sys_openat2+0x16d/0x420 fs/open.c:1168 do_sys_open fs/open.c:1184 [inline] __do_sys_open fs/open.c:1192 [inline] __se_sys_open fs/open.c:1188 [inline] __x64_sys_open+0x119/0x1c0 fs/open.c:1188 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fb405960840 Code: 73 01 c3 48 8b 0d 68 77 20 00 f7 d8 64 89 01 48 83 c8 ff c3 66 0f 1f 44 00 00 83 3d 89 bb 20 00 00 75 10 b8 02 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 31 c3 48 83 ec 08 e8 1e f6 ff ff 48 89 04 24 RSP: 002b:00007fff26dc0bd8 EFLAGS: 00000246 ORIG_RAX: 0000000000000002 RAX: ffffffffffffffda RBX: 00007fff26dc0c70 RCX: 00007fb405960840 RDX: 0000560daddc7fe3 RSI: 00000000000a0800 RDI: 0000560daede0670 RBP: 00007fff26dc1100 R08: 0000560daddc7670 R09: 0000000000000010 R10: 0000000000000000 R11: 0000000000000246 R12: 00007fff26dc0d80 R13: 0000560daed2da60 R14: 0000560daedeeef0 R15: 00007fff26dc0c50 Kernel Offset: disabled Rebooting in 86400 seconds.. --- 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. For information about bisection process see: https://goo.gl/tpsmEJ#bisection syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches

2 2

Does batman choose DHCP server by random?
by MK 02 Oct '20

02 Oct '20

Hi meshing list. We are running a batman 2020.2 based mesh network. Clients connect to one gateway but pull IPv4 addresses from _another_ gateway. This leads to packets flowing between gateways instead of leaving the mesh on the shortest route possible. Is this intended behaviour? Is it random? Is there a config option to alter this packet flow? gw_mode is set to "server" on all gateways, bandwith announcement is the same on all gateways (10/10 MBit). So no imbalance here. Regards, Martin

3 7

[PATCH v2] net: bridge: mcast: rename br_ip's u member to dst
by Linus Lüssing 28 Sep '20

28 Sep '20

1 0

[PATCH] net: bridge: mcast: rename br_ip's u member to dst
by Linus Lüssing 28 Sep '20

28 Sep '20

2 1

[PATCH 1/2] batman-adv: Re-add compat-patches infrastructure
by Sven Eckelmann 27 Sep '20

27 Sep '20

Some patches were added again in the mainline kernel which make it rather hard to allow building of the unmodified batman-adv sources against older kernel versions. Just switch again to the old build infrastructure again. It creates a copy of the sources in net/batman-adv which can be patched and then compiled+linked to create build/net/batman-adv/batman-adv.ko Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- .gitignore | 13 +----------- Makefile | 38 +++++++++++++++++++++++++++------- compat-patches/README | 27 ++++++++++++++++++++++++ compat-patches/replacements.sh | 5 +++++ 4 files changed, 64 insertions(+), 19 deletions(-) create mode 100644 compat-patches/README create mode 100755 compat-patches/replacements.sh diff --git a/.gitignore b/.gitignore index 4df7f60a..1a8dbc0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,3 @@ -/.cache.mk /compat-autoconf.h /compat-autoconf.h.tmp -/compat-sources/**/.* -/compat-sources/**/*.o -/modules.order -/Module.symvers -/net/batman-adv/batman-adv.ko -/net/batman-adv/.batman-adv.ko.cmd -/net/batman-adv/batman-adv.mod.c -/net/batman-adv/modules.order -/net/batman-adv/*.o -/net/batman-adv/.*.o.cmd -/.tmp_versions +/build/ diff --git a/Makefile b/Makefile index afdbc03c..25c75f46 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ export CONFIG_BATMAN_ADV_SYSFS=n export CONFIG_BATMAN_ADV_TRACING=n PWD:=$(shell pwd) +BUILD_DIR=$(PWD)/build KERNELPATH ?= /lib/modules/$(shell uname -r)/build # sanity check: does KERNELPATH exist? ifeq ($(shell cd $(KERNELPATH) && pwd),) @@ -32,17 +33,24 @@ endif export KERNELPATH RM ?= rm -f +MKDIR := mkdir -p +PATCH_FLAGS = --batch --fuzz=0 --forward --strip=1 --unified --version-control=never -g0 --remove-empty-files --no-backup-if-mismatch --reject-file=- +PATCH := patch $(PATCH_FLAGS) -i CP := cp -fpR LN := ln -sf DEPMOD := depmod -a +SOURCE = $(wildcard net/batman-adv/*.[ch]) net/batman-adv/Makefile +SOURCE_BUILD = $(wildcard $(BUILD_DIR)/net/batman-adv/*.[ch]) $(BUILD_DIR)/net/batman-adv/Makefile +SOURCE_STAMP = $(BUILD_DIR)/net/batman-adv/.compat-prepared + REVISION= $(shell if [ -d "$(PWD)/.git" ]; then \ echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ fi) NOSTDINC_FLAGS += \ - -I$(PWD)/compat-include/ \ - -I$(PWD)/include/ \ - -include $(PWD)/compat.h \ + -I$(PWD)/../compat-include/ \ + -I$(PWD)/../include/ \ + -include $(PWD)/../compat.h \ $(CFLAGS) ifneq ($(REVISION),) @@ -55,8 +63,8 @@ export batman-adv-y BUILD_FLAGS := \ - M=$(PWD) \ - PWD=$(PWD) \ + M=$(BUILD_DIR) \ + PWD=$(BUILD_DIR) \ REVISION=$(REVISION) \ CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV_DEBUG=$(CONFIG_BATMAN_ADV_DEBUG) \ @@ -70,18 +78,34 @@ BUILD_FLAGS := \ CONFIG_BATMAN_ADV_BATMAN_V=$(CONFIG_BATMAN_ADV_BATMAN_V) \ INSTALL_MOD_DIR=updates/ -all: config +all: config $(SOURCE_STAMP) $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules clean: $(RM) compat-autoconf.h* $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) clean -install: config +install: config $(SOURCE_STAMP) $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules_install $(DEPMOD) config: $(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h +$(SOURCE_STAMP): $(SOURCE) compat-patches/* compat-patches/replacements.sh + $(MKDIR) $(BUILD_DIR)/net/batman-adv/ + @$(LN) ../Makefile $(BUILD_DIR)/Makefile + @$(RM) $(SOURCE_BUILD) + @$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/ + @set -e; \ + patches="$$(ls -1 compat-patches/|grep '.patch$$'|sort)"; \ + for i in $${patches}; do \ + echo ' COMPAT_PATCH '$${i};\ + cd $(BUILD_DIR); \ + $(PATCH) ../compat-patches/$${i}; \ + cd - > /dev/null; \ + done + compat-patches/replacements.sh + touch $(SOURCE_STAMP) + .PHONY: all clean install config diff --git a/compat-patches/README b/compat-patches/README new file mode 100644 index 00000000..55cb0fe2 --- /dev/null +++ b/compat-patches/README @@ -0,0 +1,27 @@ +.. SPDX-License-Identifier: GPL-2.0 + +WARNING +======= + +Please avoid using the compat-patches/ to implement support for old kernels. +This should be the last resort. + + * it is nearly always possible to use compat-includes/ to do the same with a + lot less problems + + * maintaining these patches is *censored* + +GENERATING A PATCH +================== + +If it not possible to avoid a patch then please make the patch as small as +possible. Even refactor the code which has to be patched to reduce the +size/number of the changes. + +Please use git-format-patches to generate them and order them inside via the +XXXX- prefix before the patch name. + + git format-patch --no-stat --full-index --no-renames --binary \ + --diff-algorithm=histogram --no-signature \ + --format=format:'From: %an <%ae>%nDate: %aD%nSubject: %B' \ + -1 diff --git a/compat-patches/replacements.sh b/compat-patches/replacements.sh new file mode 100755 index 00000000..1b64e5c2 --- /dev/null +++ b/compat-patches/replacements.sh @@ -0,0 +1,5 @@ +#! /bin/sh +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2007-2018 B.A.T.M.A.N. contributors + +set -e -- 2.28.0

2 2

KASAN: vmalloc-out-of-bounds Read in bpf_trace_run5
by syzbot 24 Sep '20

24 Sep '20

Hello, syzbot found the following issue on: HEAD commit: b10b8ad8 Add linux-next specific files for 20200921 git tree: linux-next console output: https://syzkaller.appspot.com/x/log.txt?x=1371eb1d900000 kernel config: https://syzkaller.appspot.com/x/.config?x=3cf0782933432b43 dashboard link: https://syzkaller.appspot.com/bug?extid=856297c51366950e115e compiler: gcc (GCC) 10.1.0-syz 20200507 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1510d3d9900000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1328ecbb900000 The issue was bisected to: commit 1e6d690b9334b7e1b31d25fd8d93e980e449a5f9 Author: Song Liu <songliubraving(a)fb.com> Date: Thu Nov 17 23:24:39 2016 +0000 md/r5cache: caching phase of r5cache bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=109283d9900000 final oops: https://syzkaller.appspot.com/x/report.txt?x=129283d9900000 console output: https://syzkaller.appspot.com/x/log.txt?x=149283d9900000 IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+856297c51366950e115e(a)syzkaller.appspotmail.com Fixes: 1e6d690b9334 ("md/r5cache: caching phase of r5cache") ================================================================== BUG: KASAN: vmalloc-out-of-bounds in __bpf_trace_run kernel/trace/bpf_trace.c:1937 [inline] BUG: KASAN: vmalloc-out-of-bounds in bpf_trace_run5+0x401/0x410 kernel/trace/bpf_trace.c:1977 Read of size 8 at addr ffffc90000e80030 by task rs:main Q:Reg/6567 CPU: 1 PID: 6567 Comm: rs:main Q:Reg Not tainted 5.9.0-rc5-next-20200921-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+0x198/0x1fb lib/dump_stack.c:118 print_address_description.constprop.0.cold+0x5/0x497 mm/kasan/report.c:385 __kasan_report mm/kasan/report.c:545 [inline] kasan_report.cold+0x1f/0x37 mm/kasan/report.c:562 __bpf_trace_run kernel/trace/bpf_trace.c:1937 [inline] bpf_trace_run5+0x401/0x410 kernel/trace/bpf_trace.c:1977 __bpf_trace_ext4_journal_start+0x142/0x180 include/trace/events/ext4.h:1788 __traceiter_ext4_journal_start+0x83/0xd0 include/trace/events/ext4.h:1788 trace_ext4_journal_start include/trace/events/ext4.h:1788 [inline] __ext4_journal_start_sb+0x228/0x440 fs/ext4/ext4_jbd2.c:96 __ext4_journal_start fs/ext4/ext4_jbd2.h:328 [inline] ext4_dirty_inode+0xbc/0x130 fs/ext4/inode.c:5850 __mark_inode_dirty+0x888/0x1190 fs/fs-writeback.c:2260 generic_update_time+0x21c/0x370 fs/inode.c:1764 update_time fs/inode.c:1777 [inline] file_update_time+0x434/0x520 fs/inode.c:1992 file_modified fs/inode.c:2015 [inline] file_modified+0x7d/0xa0 fs/inode.c:2000 ext4_write_checks fs/ext4/file.c:248 [inline] ext4_buffered_write_iter+0xf9/0x4a0 fs/ext4/file.c:264 ext4_file_write_iter+0x1f3/0x13e0 fs/ext4/file.c:660 call_write_iter include/linux/fs.h:1895 [inline] new_sync_write+0x426/0x650 fs/read_write.c:517 vfs_write+0x57d/0x700 fs/read_write.c:595 ksys_write+0x12d/0x250 fs/read_write.c:648 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fed08e3a1cd Code: c2 20 00 00 75 10 b8 01 00 00 00 0f 05 48 3d 01 f0 ff ff 73 31 c3 48 83 ec 08 e8 ae fc ff ff 48 89 04 24 b8 01 00 00 00 0f 05 <48> 8b 3c 24 48 89 c2 e8 f7 fc ff ff 48 89 d0 48 83 c4 08 48 3d 01 RSP: 002b:00007fed063f5590 EFLAGS: 00000293 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 00007fecfc0238a0 RCX: 00007fed08e3a1cd RDX: 0000000000000dd6 RSI: 00007fecfc0238a0 RDI: 0000000000000006 RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000293 R12: 00007fecfc023620 R13: 00007fed063f55b0 R14: 0000560a2b025360 R15: 0000000000000dd6 Memory state around the buggy address: ffffc90000e7ff00: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 ffffc90000e7ff80: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 >ffffc90000e80000: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 ^ ffffc90000e80080: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 ffffc90000e80100: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 ================================================================== --- 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. For information about bisection process see: https://goo.gl/tpsmEJ#bisection syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches

1 0

[PATCH net-next v2 06/16] net: bridge: mcast: rename br_ip's u member to dst
by Nikolay Aleksandrov 22 Sep '20

22 Sep '20

From: Nikolay Aleksandrov <nikolay(a)nvidia.com> Since now we have src in br_ip, u no longer makes sense so rename it to dst. No functional changes. v2: fix build with CONFIG_BATMAN_ADV_MCAST CC: Marek Lindner <mareklindner(a)neomailbox.ch> CC: Simon Wunderlich <sw(a)simonwunderlich.de> CC: Antonio Quartulli <a(a)unstable.cc> CC: Sven Eckelmann <sven(a)narfation.org> CC: b.a.t.m.a.n(a)lists.open-mesh.org Signed-off-by: Nikolay Aleksandrov <nikolay(a)nvidia.com> --- include/linux/if_bridge.h | 2 +- net/batman-adv/multicast.c | 14 +++++++------- net/bridge/br_mdb.c | 16 ++++++++-------- net/bridge/br_multicast.c | 26 +++++++++++++------------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index 4fb9c4954f3a..556caed00258 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -25,7 +25,7 @@ struct br_ip { #if IS_ENABLED(CONFIG_IPV6) struct in6_addr ip6; #endif - } u; + } dst; __be16 proto; __u16 vid; }; diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 1622c3f5898f..7dda0f7b3d96 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -220,7 +220,7 @@ static u8 batadv_mcast_mla_rtr_flags_bridge_get(struct batadv_priv *bat_priv, * address here, only IPv6 ones */ if (br_ip_entry->addr.proto == htons(ETH_P_IPV6) && - ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.u.ip6)) + ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.dst.ip6)) flags &= ~BATADV_MCAST_WANT_NO_RTR6; list_del(&br_ip_entry->list); @@ -561,10 +561,10 @@ batadv_mcast_mla_softif_get(struct net_device *dev, static void batadv_mcast_mla_br_addr_cpy(char *dst, const struct br_ip *src) { if (src->proto == htons(ETH_P_IP)) - ip_eth_mc_map(src->u.ip4, dst); + ip_eth_mc_map(src->dst.ip4, dst); #if IS_ENABLED(CONFIG_IPV6) else if (src->proto == htons(ETH_P_IPV6)) - ipv6_eth_mc_map(&src->u.ip6, dst); + ipv6_eth_mc_map(&src->dst.ip6, dst); #endif else eth_zero_addr(dst); @@ -608,11 +608,11 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev, continue; if (tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES && - ipv4_is_local_multicast(br_ip_entry->addr.u.ip4)) + ipv4_is_local_multicast(br_ip_entry->addr.dst.ip4)) continue; if (!(tvlv_flags & BATADV_MCAST_WANT_NO_RTR4) && - !ipv4_is_local_multicast(br_ip_entry->addr.u.ip4)) + !ipv4_is_local_multicast(br_ip_entry->addr.dst.ip4)) continue; } @@ -622,11 +622,11 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev, continue; if (tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES && - ipv6_addr_is_ll_all_nodes(&br_ip_entry->addr.u.ip6)) + ipv6_addr_is_ll_all_nodes(&br_ip_entry->addr.dst.ip6)) continue; if (!(tvlv_flags & BATADV_MCAST_WANT_NO_RTR6) && - IPV6_ADDR_MC_SCOPE(&br_ip_entry->addr.u.ip6) > + IPV6_ADDR_MC_SCOPE(&br_ip_entry->addr.dst.ip6) > IPV6_ADDR_SCOPE_LINKLOCAL) continue; } diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 269ffd2e549b..a1ff0a372185 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -70,10 +70,10 @@ static void __mdb_entry_to_br_ip(struct br_mdb_entry *entry, struct br_ip *ip) ip->vid = entry->vid; ip->proto = entry->addr.proto; if (ip->proto == htons(ETH_P_IP)) - ip->u.ip4 = entry->addr.u.ip4; + ip->dst.ip4 = entry->addr.u.ip4; #if IS_ENABLED(CONFIG_IPV6) else - ip->u.ip6 = entry->addr.u.ip6; + ip->dst.ip6 = entry->addr.u.ip6; #endif } @@ -158,10 +158,10 @@ static int __mdb_fill_info(struct sk_buff *skb, e.ifindex = ifindex; e.vid = mp->addr.vid; if (mp->addr.proto == htons(ETH_P_IP)) - e.addr.u.ip4 = mp->addr.u.ip4; + e.addr.u.ip4 = mp->addr.dst.ip4; #if IS_ENABLED(CONFIG_IPV6) if (mp->addr.proto == htons(ETH_P_IPV6)) - e.addr.u.ip6 = mp->addr.u.ip6; + e.addr.u.ip6 = mp->addr.dst.ip6; #endif e.addr.proto = mp->addr.proto; nest_ent = nla_nest_start_noflag(skb, @@ -474,10 +474,10 @@ static void br_mdb_switchdev_host_port(struct net_device *dev, }; if (mp->addr.proto == htons(ETH_P_IP)) - ip_eth_mc_map(mp->addr.u.ip4, mdb.addr); + ip_eth_mc_map(mp->addr.dst.ip4, mdb.addr); #if IS_ENABLED(CONFIG_IPV6) else - ipv6_eth_mc_map(&mp->addr.u.ip6, mdb.addr); + ipv6_eth_mc_map(&mp->addr.dst.ip6, mdb.addr); #endif mdb.obj.orig_dev = dev; @@ -520,10 +520,10 @@ void br_mdb_notify(struct net_device *dev, if (pg) { if (mp->addr.proto == htons(ETH_P_IP)) - ip_eth_mc_map(mp->addr.u.ip4, mdb.addr); + ip_eth_mc_map(mp->addr.dst.ip4, mdb.addr); #if IS_ENABLED(CONFIG_IPV6) else - ipv6_eth_mc_map(&mp->addr.u.ip6, mdb.addr); + ipv6_eth_mc_map(&mp->addr.dst.ip6, mdb.addr); #endif mdb.obj.orig_dev = pg->port->dev; switch (type) { diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index a899c22c8f57..e1fb822b9ddb 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -86,7 +86,7 @@ static struct net_bridge_mdb_entry *br_mdb_ip4_get(struct net_bridge *br, struct br_ip br_dst; memset(&br_dst, 0, sizeof(br_dst)); - br_dst.u.ip4 = dst; + br_dst.dst.ip4 = dst; br_dst.proto = htons(ETH_P_IP); br_dst.vid = vid; @@ -101,7 +101,7 @@ static struct net_bridge_mdb_entry *br_mdb_ip6_get(struct net_bridge *br, struct br_ip br_dst; memset(&br_dst, 0, sizeof(br_dst)); - br_dst.u.ip6 = *dst; + br_dst.dst.ip6 = *dst; br_dst.proto = htons(ETH_P_IPV6); br_dst.vid = vid; @@ -126,11 +126,11 @@ struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br, switch (skb->protocol) { case htons(ETH_P_IP): - ip.u.ip4 = ip_hdr(skb)->daddr; + ip.dst.ip4 = ip_hdr(skb)->daddr; break; #if IS_ENABLED(CONFIG_IPV6) case htons(ETH_P_IPV6): - ip.u.ip6 = ipv6_hdr(skb)->daddr; + ip.dst.ip6 = ipv6_hdr(skb)->daddr; break; #endif default: @@ -625,9 +625,9 @@ static struct sk_buff *br_multicast_alloc_query(struct net_bridge *br, switch (group->proto) { case htons(ETH_P_IP): - ip4_dst = ip_dst ? ip_dst->u.ip4 : htonl(INADDR_ALLHOSTS_GROUP); + ip4_dst = ip_dst ? ip_dst->dst.ip4 : htonl(INADDR_ALLHOSTS_GROUP); return br_ip4_multicast_alloc_query(br, pg, - ip4_dst, group->u.ip4, + ip4_dst, group->dst.ip4, with_srcs, over_lmqt, sflag, igmp_type, need_rexmit); @@ -636,13 +636,13 @@ static struct sk_buff *br_multicast_alloc_query(struct net_bridge *br, struct in6_addr ip6_dst; if (ip_dst) - ip6_dst = ip_dst->u.ip6; + ip6_dst = ip_dst->dst.ip6; else ipv6_addr_set(&ip6_dst, htonl(0xff020000), 0, 0, htonl(1)); return br_ip6_multicast_alloc_query(br, pg, - &ip6_dst, &group->u.ip6, + &ip6_dst, &group->dst.ip6, with_srcs, over_lmqt, sflag, igmp_type, need_rexmit); @@ -906,7 +906,7 @@ static int br_ip4_multicast_add_group(struct net_bridge *br, return 0; memset(&br_group, 0, sizeof(br_group)); - br_group.u.ip4 = group; + br_group.dst.ip4 = group; br_group.proto = htons(ETH_P_IP); br_group.vid = vid; filter_mode = igmpv2 ? MCAST_EXCLUDE : MCAST_INCLUDE; @@ -930,7 +930,7 @@ static int br_ip6_multicast_add_group(struct net_bridge *br, return 0; memset(&br_group, 0, sizeof(br_group)); - br_group.u.ip6 = *group; + br_group.dst.ip6 = *group; br_group.proto = htons(ETH_P_IPV6); br_group.vid = vid; filter_mode = mldv1 ? MCAST_EXCLUDE : MCAST_INCLUDE; @@ -1079,7 +1079,7 @@ static void br_multicast_send_query(struct net_bridge *br, !br_opt_get(br, BROPT_MULTICAST_QUERIER)) return; - memset(&br_group.u, 0, sizeof(br_group.u)); + memset(&br_group.dst, 0, sizeof(br_group.dst)); if (port ? (own_query == &port->ip4_own_query) : (own_query == &br->ip4_own_query)) { @@ -2506,7 +2506,7 @@ static void br_ip4_multicast_leave_group(struct net_bridge *br, own_query = port ? &port->ip4_own_query : &br->ip4_own_query; memset(&br_group, 0, sizeof(br_group)); - br_group.u.ip4 = group; + br_group.dst.ip4 = group; br_group.proto = htons(ETH_P_IP); br_group.vid = vid; @@ -2530,7 +2530,7 @@ static void br_ip6_multicast_leave_group(struct net_bridge *br, own_query = port ? &port->ip6_own_query : &br->ip6_own_query; memset(&br_group, 0, sizeof(br_group)); - br_group.u.ip6 = *group; + br_group.dst.ip6 = *group; br_group.proto = htons(ETH_P_IPV6); br_group.vid = vid; -- 2.25.4

2 2

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N September 2020