1. 07 May, 2021 2 commits
    • Eric Dumazet's avatar
      netfilter: nftables: avoid potential overflows on 32bit arches · 6c8774a9
      Eric Dumazet authored
      User space could ask for very large hash tables, we need to make sure
      our size computations wont overflow.
      
      nf_tables_newset() needs to double check the u64 size
      will fit into size_t field.
      
      Fixes: 0ed6389c ("netfilter: nf_tables: rename set implementations")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      6c8774a9
    • Eric Dumazet's avatar
      netfilter: nftables: avoid overflows in nft_hash_buckets() · a54754ec
      Eric Dumazet authored
      Number of buckets being stored in 32bit variables, we have to
      ensure that no overflows occur in nft_hash_buckets()
      
      syzbot injected a size == 0x40000000 and reported:
      
      UBSAN: shift-out-of-bounds in ./include/linux/log2.h:57:13
      shift exponent 64 is too large for 64-bit type 'long unsigned int'
      CPU: 1 PID: 29539 Comm: syz-executor.4 Not tainted 5.12.0-rc7-syzkaller #0
      Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
      Call Trace:
       __dump_stack lib/dump_stack.c:79 [inline]
       dump_stack+0x141/0x1d7 lib/dump_stack.c:120
       ubsan_epilogue+0xb/0x5a lib/ubsan.c:148
       __ubsan_handle_shift_out_of_bounds.cold+0xb1/0x181 lib/ubsan.c:327
       __roundup_pow_of_two include/linux/log2.h:57 [inline]
       nft_hash_buckets net/netfilter/nft_set_hash.c:411 [inline]
       nft_hash_estimate.cold+0x19/0x1e net/netfilter/nft_set_hash.c:652
       nft_select_set_ops net/netfilter/nf_tables_api.c:3586 [inline]
       nf_tables_newset+0xe62/0x3110 net/netfilter/nf_tables_api.c:4322
       nfnetlink_rcv_batch+0xa09/0x24b0 net/netfilter/nfnetlink.c:488
       nfnetlink_rcv_skb_batch net/netfilter/nfnetlink.c:612 [inline]
       nfnetlink_rcv+0x3af/0x420 net/netfilter/nfnetlink.c:630
       netlink_unicast_kernel net/netlink/af_netlink.c:1312 [inline]
       netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1338
       netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1927
       sock_sendmsg_nosec net/socket.c:654 [inline]
       sock_sendmsg+0xcf/0x120 net/socket.c:674
       ____sys_sendmsg+0x6e8/0x810 net/socket.c:2350
       ___sys_sendmsg+0xf3/0x170 net/socket.c:2404
       __sys_sendmsg+0xe5/0x1b0 net/socket.c:2433
       do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46
      
      Fixes: 0ed6389c ("netfilter: nf_tables: rename set implementations")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarsyzbot <syzkaller@googlegroups.com>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      a54754ec
  2. 05 May, 2021 4 commits
    • Pablo Neira Ayuso's avatar
      netfilter: nftables: Fix a memleak from userdata error path in new objects · 85dfd816
      Pablo Neira Ayuso authored
      Release object name if userdata allocation fails.
      
      Fixes: b131c964 ("netfilter: nf_tables: add userdata support for nft_object")
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      85dfd816
    • Pablo Neira Ayuso's avatar
      netfilter: remove BUG_ON() after skb_header_pointer() · 198ad973
      Pablo Neira Ayuso authored
      Several conntrack helpers and the TCP tracker assume that
      skb_header_pointer() never fails based on upfront header validation.
      Even if this should not ever happen, BUG_ON() is a too drastic measure,
      remove them.
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      198ad973
    • Pablo Neira Ayuso's avatar
      netfilter: nfnetlink_osf: Fix a missing skb_header_pointer() NULL check · 5e024c32
      Pablo Neira Ayuso authored
      Do not assume that the tcph->doff field is correct when parsing for TCP
      options, skb_header_pointer() might fail to fetch these bits.
      
      Fixes: 11eeef41 ("netfilter: passive OS fingerprint xtables match")
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      5e024c32
    • Eric Dumazet's avatar
      netfilter: nfnetlink: add a missing rcu_read_unlock() · 7072a355
      Eric Dumazet authored
      Reported by syzbot :
      BUG: sleeping function called from invalid context at include/linux/sched/mm.h:201
      in_atomic(): 0, irqs_disabled(): 0, non_block: 0, pid: 26899, name: syz-executor.5
      1 lock held by syz-executor.5/26899:
       #0: ffffffff8bf797a0 (rcu_read_lock){....}-{1:2}, at: nfnetlink_get_subsys net/netfilter/nfnetlink.c:148 [inline]
       #0: ffffffff8bf797a0 (rcu_read_lock){....}-{1:2}, at: nfnetlink_rcv_msg+0x1da/0x1300 net/netfilter/nfnetlink.c:226
      Preemption disabled at:
      [<ffffffff8917799e>] preempt_schedule_irq+0x3e/0x90 kernel/sched/core.c:5533
      CPU: 1 PID: 26899 Comm: syz-executor.5 Not tainted 5.12.0-next-20210504-syzkaller #0
      Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
      Call Trace:
       __dump_stack lib/dump_stack.c:79 [inline]
       dump_stack+0x141/0x1d7 lib/dump_stack.c:120
       ___might_sleep.cold+0x1f1/0x237 kernel/sched/core.c:8338
       might_alloc include/linux/sched/mm.h:201 [inline]
       slab_pre_alloc_hook mm/slab.h:500 [inline]
       slab_alloc_node mm/slub.c:2845 [inline]
       kmem_cache_alloc_node+0x33d/0x3e0 mm/slub.c:2960
       __alloc_skb+0x20b/0x340 net/core/skbuff.c:413
       alloc_skb include/linux/skbuff.h:1107 [inline]
       nlmsg_new include/net/netlink.h:953 [inline]
       netlink_ack+0x1ed/0xaa0 net/netlink/af_netlink.c:2437
       netlink_rcv_skb+0x33d/0x420 net/netlink/af_netlink.c:2508
       nfnetlink_rcv+0x1ac/0x420 net/netfilter/nfnetlink.c:650
       netlink_unicast_kernel net/netlink/af_netlink.c:1312 [inline]
       netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1338
       netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1927
       sock_sendmsg_nosec net/socket.c:654 [inline]
       sock_sendmsg+0xcf/0x120 net/socket.c:674
       ____sys_sendmsg+0x6e8/0x810 net/socket.c:2350
       ___sys_sendmsg+0xf3/0x170 net/socket.c:2404
       __sys_sendmsg+0xe5/0x1b0 net/socket.c:2433
       do_syscall_64+0x3a/0xb0 arch/x86/entry/common.c:47
       entry_SYSCALL_64_after_hwframe+0x44/0xae
      RIP: 0033:0x4665f9
      Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 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 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48
      RSP: 002b:00007fa8a03ee188 EFLAGS: 00000246 ORIG_RAX: 000000000000002e
      RAX: ffffffffffffffda RBX: 000000000056bf60 RCX: 00000000004665f9
      RDX: 0000000000000000 RSI: 0000000020000480 RDI: 0000000000000004
      RBP: 00000000004bfce1 R08: 0000000000000000 R09: 0000000000000000
      R10: 0000000000000000 R11: 0000000000000246 R12: 000000000056bf60
      R13: 00007fffe864480f R14: 00007fa8a03ee300 R15: 0000000000022000
      
      ================================================
      WARNING: lock held when returning to user space!
      5.12.0-next-20210504-syzkaller #0 Tainted: G        W
      ------------------------------------------------
      syz-executor.5/26899 is leaving the kernel with locks still held!
      1 lock held by syz-executor.5/26899:
       #0: ffffffff8bf797a0 (rcu_read_lock){....}-{1:2}, at: nfnetlink_get_subsys net/netfilter/nfnetlink.c:148 [inline]
       #0: ffffffff8bf797a0 (rcu_read_lock){....}-{1:2}, at: nfnetlink_rcv_msg+0x1da/0x1300 net/netfilter/nfnetlink.c:226
      ------------[ cut here ]------------
      WARNING: CPU: 0 PID: 26899 at kernel/rcu/tree_plugin.h:359 rcu_note_context_switch+0xfd/0x16e0 kernel/rcu/tree_plugin.h:359
      Modules linked in:
      CPU: 0 PID: 26899 Comm: syz-executor.5 Tainted: G        W         5.12.0-next-20210504-syzkaller #0
      Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
      RIP: 0010:rcu_note_context_switch+0xfd/0x16e0 kernel/rcu/tree_plugin.h:359
      Code: 48 89 fa 48 c1 ea 03 0f b6 14 02 48 89 f8 83 e0 07 83 c0 03 38 d0 7c 08 84 d2 0f 85 2e 0d 00 00 8b bd cc 03 00 00 85 ff 7e 02 <0f> 0b 65 48 8b 2c 25 00 f0 01 00 48 8d bd cc 03 00 00 48 b8 00 00
      RSP: 0000:ffffc90002fffdb0 EFLAGS: 00010002
      RAX: 0000000000000007 RBX: ffff8880b9c36080 RCX: ffffffff8dc99bac
      RDX: 0000000000000000 RSI: 0000000000000008 RDI: 0000000000000001
      RBP: ffff88808b9d1c80 R08: 0000000000000000 R09: ffffffff8dc96917
      R10: fffffbfff1b92d22 R11: 0000000000000000 R12: 0000000000000000
      R13: ffff88808b9d1c80 R14: ffff88808b9d1c80 R15: ffffc90002ff8000
      FS:  00007fa8a03ee700(0000) GS:ffff8880b9c00000(0000) knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      CR2: 00007f09896ed000 CR3: 0000000032070000 CR4: 00000000001526f0
      DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
      Call Trace:
       __schedule+0x214/0x23e0 kernel/sched/core.c:5044
       schedule+0xcf/0x270 kernel/sched/core.c:5226
       exit_to_user_mode_loop kernel/entry/common.c:162 [inline]
       exit_to_user_mode_prepare+0x13e/0x280 kernel/entry/common.c:208
       irqentry_exit_to_user_mode+0x5/0x40 kernel/entry/common.c:314
       asm_sysvec_reschedule_ipi+0x12/0x20 arch/x86/include/asm/idtentry.h:637
      RIP: 0033:0x4665f9
      
      Fixes: 50f2db9e ("netfilter: nfnetlink: consolidate callback types")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarsyzbot <syzkaller@googlegroups.com>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      7072a355
  3. 03 May, 2021 13 commits
  4. 30 Apr, 2021 15 commits
  5. 29 Apr, 2021 6 commits