1. Jul 29, 2022
    • David S. Miller's avatar
      Merge branch 'netdevsim-fib-route-delete-leak' · b65a1534
      David S. Miller authored
      
      
      Ido Schimmel says:
      
      ====================
      netdevsim: fib: Fix reference count leak on route deletion failure
      
      Fix a recently reported netdevsim bug found using syzkaller.
      
      Patch #1 fixes the bug.
      
      Patch #2 adds a debugfs knob to allow us to test the fix.
      
      Patch #3 adds test cases.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b65a1534
    • Ido Schimmel's avatar
      selftests: netdevsim: Add test cases for route deletion failure · 40823f3e
      Ido Schimmel authored
      
      
      Add IPv4 and IPv6 test cases that ensure that we are not leaking a
      reference on the nexthop device when we are unable to delete its
      associated route.
      
      Without the fix in a previous patch ("netdevsim: fib: Fix reference
      count leak on route deletion failure") both test cases get stuck,
      waiting for the reference to be released from the dummy device [1][2].
      
      [1]
      unregister_netdevice: waiting for dummy1 to become free. Usage count = 5
      leaked reference.
       fib_check_nh+0x275/0x620
       fib_create_info+0x237c/0x4d30
       fib_table_insert+0x1dd/0x1d20
       inet_rtm_newroute+0x11b/0x200
       rtnetlink_rcv_msg+0x43b/0xd20
       netlink_rcv_skb+0x15e/0x430
       netlink_unicast+0x53b/0x800
       netlink_sendmsg+0x945/0xe40
       ____sys_sendmsg+0x747/0x960
       ___sys_sendmsg+0x11d/0x190
       __sys_sendmsg+0x118/0x1e0
       do_syscall_64+0x34/0x80
       entry_SYSCALL_64_after_hwframe+0x63/0xcd
      
      [2]
      unregister_netdevice: waiting for dummy1 to become free. Usage count = 5
      leaked reference.
       fib6_nh_init+0xc46/0x1ca0
       ip6_route_info_create+0x1167/0x19a0
       ip6_route_add+0x27/0x150
       inet6_rtm_newroute+0x161/0x170
       rtnetlink_rcv_msg+0x43b/0xd20
       netlink_rcv_skb+0x15e/0x430
       netlink_unicast+0x53b/0x800
       netlink_sendmsg+0x945/0xe40
       ____sys_sendmsg+0x747/0x960
       ___sys_sendmsg+0x11d/0x190
       __sys_sendmsg+0x118/0x1e0
       do_syscall_64+0x34/0x80
       entry_SYSCALL_64_after_hwframe+0x63/0xcd
      
      Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
      Reviewed-by: default avatarAmit Cohen <amcohen@nvidia.com>
      Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      40823f3e
    • Ido Schimmel's avatar
      netdevsim: fib: Add debugfs knob to simulate route deletion failure · 974be75f
      Ido Schimmel authored
      
      
      The previous patch ("netdevsim: fib: Fix reference count leak on route
      deletion failure") fixed a reference count leak that happens on route
      deletion failure.
      
      Such failures can only be simulated by injecting slab allocation
      failures, which cannot be surgically injected.
      
      In order to be able to specifically test this scenario, add a debugfs
      knob that allows user space to fail route deletion requests when
      enabled.
      
      Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
      Reviewed-by: default avatarAmit Cohen <amcohen@nvidia.com>
      Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      974be75f
    • Ido Schimmel's avatar
      netdevsim: fib: Fix reference count leak on route deletion failure · 180a6a3e
      Ido Schimmel authored
      As part of FIB offload simulation, netdevsim stores IPv4 and IPv6 routes
      and holds a reference on FIB info structures that in turn hold a
      reference on the associated nexthop device(s).
      
      In the unlikely case where we are unable to allocate memory to process a
      route deletion request, netdevsim will not release the reference from
      the associated FIB info structure, thereby preventing the associated
      nexthop device(s) from ever being removed [1].
      
      Fix this by scheduling a work item that will flush netdevsim's FIB table
      upon route deletion failure. This will cause netdevsim to release its
      reference from all the FIB info structures in its table.
      
      Reported by Lucas Leong of Trend Micro Zero Day Initiative.
      
      Fixes: 0ae3eb7b
      
       ("netdevsim: fib: Perform the route programming in a non-atomic context")
      Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
      Reviewed-by: default avatarAmit Cohen <amcohen@nvidia.com>
      Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      180a6a3e
    • Mike Manning's avatar
      net: allow unbound socket for packets in VRF when tcp_l3mdev_accept set · 944fd1ae
      Mike Manning authored
      The commit 3c82a21f ("net: allow binding socket in a VRF when
      there's an unbound socket") changed the inet socket lookup to avoid
      packets in a VRF from matching an unbound socket. This is to ensure the
      necessary isolation between the default and other VRFs for routing and
      forwarding. VRF-unaware processes running in the default VRF cannot
      access another VRF and have to be run with 'ip vrf exec <vrf>'. This is
      to be expected with tcp_l3mdev_accept disabled, but could be reallowed
      when this sysctl option is enabled. So instead of directly checking dif
      and sdif in inet[6]_match, here call inet_sk_bound_dev_eq(). This
      allows a match on unbound socket for non-zero sdif i.e. for packets in
      a VRF, if tcp_l3mdev_accept is enabled.
      
      Fixes: 3c82a21f
      
       ("net: allow binding socket in a VRF when there's an unbound socket")
      Signed-off-by: default avatarMike Manning <mvrmanning@gmail.com>
      Link: https://lore.kernel.org/netdev/a54c149aed38fded2d3b5fdb1a6c89e36a083b74.camel@lasnet.de/
      
      
      Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      944fd1ae
    • Eric Dumazet's avatar
      ax25: fix incorrect dev_tracker usage · d7c4c9e0
      Eric Dumazet authored
      While investigating a separate rose issue [1], and enabling
      CONFIG_NET_DEV_REFCNT_TRACKER=y, Bernard reported an orthogonal ax25 issue [2]
      
      An ax25_dev can be used by one (or many) struct ax25_cb.
      We thus need different dev_tracker, one per struct ax25_cb.
      
      After this patch is applied, we are able to focus on rose.
      
      [1] https://lore.kernel.org/netdev/fb7544a1-f42e-9254-18cc-c9b071f4ca70@free.fr/
      
      [2]
      [  205.798723] reference already released.
      [  205.798732] allocated in:
      [  205.798734]  ax25_bind+0x1a2/0x230 [ax25]
      [  205.798747]  __sys_bind+0xea/0x110
      [  205.798753]  __x64_sys_bind+0x18/0x20
      [  205.798758]  do_syscall_64+0x5c/0x80
      [  205.798763]  entry_SYSCALL_64_after_hwframe+0x44/0xae
      [  205.798768] freed in:
      [  205.798770]  ax25_release+0x115/0x370 [ax25]
      [  205.798778]  __sock_release+0x42/0xb0
      [  205.798782]  sock_close+0x15/0x20
      [  205.798785]  __fput+0x9f/0x260
      [  205.798789]  ____fput+0xe/0x10
      [  205.798792]  task_work_run+0x64/0xa0
      [  205.798798]  exit_to_us...
      d7c4c9e0
    • Linus Torvalds's avatar
      Merge tag 'net-5.19-final' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 33ea1340
      Linus Torvalds authored
      Pull networking fixes from Jakub Kicinski:
       "Including fixes from bluetooth and netfilter, no known blockers for
        the release.
      
        Current release - regressions:
      
         - wifi: mac80211: do not abuse fq.lock in ieee80211_do_stop(), fix
           taking the lock before its initialized
      
         - Bluetooth: mgmt: fix double free on error path
      
        Current release - new code bugs:
      
         - eth: ice: fix tunnel checksum offload with fragmented traffic
      
        Previous releases - regressions:
      
         - tcp: md5: fix IPv4-mapped support after refactoring, don't take the
           pure v6 path
      
         - Revert "tcp: change pingpong threshold to 3", improving detection
           of interactive sessions
      
         - mld: fix netdev refcount leak in mld_{query | report}_work() due to
           a race
      
         - Bluetooth:
            - always set event mask on suspend, avoid early wake ups
            - L2CAP: fix use-after-free caused by l2cap_chan_put
      
         - bridge: do not send empty IFLA_AF_SPEC attribute
      
        Previous releases - always broken:
      
         - ping6: fix memleak in ipv6_renew_options()
      
         - sctp: prevent null-deref caused by over-eager error paths
      
         - virtio-net: fix the race between refill work and close, resulting
           in NAPI scheduled after close and a BUG()
      
         - macsec:
            - fix three netlink parsing bugs
            - avoid breaking the device state on invalid change requests
            - fix a memleak in another error path
      
        Misc:
      
         - dt-bindings: net: ethernet-controller: rework 'fixed-link' schema
      
         - two more batches of sysctl data race adornment"
      
      * tag 'net-5.19-final' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (67 commits)
        stmmac: dwmac-mediatek: fix resource leak in probe
        ipv6/addrconf: fix a null-ptr-deref bug for ip6_ptr
        net: ping6: Fix memleak in ipv6_renew_options().
        net/funeth: Fix fun_xdp_tx() and XDP packet reclaim
        sctp: leave the err path free in sctp_stream_init to sctp_stream_free
        sfc: disable softirqs for ptp TX
        ptp: ocp: Select CRC16 in the Kconfig.
        tcp: md5: fix IPv4-mapped support
        virtio-net: fix the race between refill work and close
        mptcp: Do not return EINPROGRESS when subflow creation succeeds
        Bluetooth: L2CAP: Fix use-after-free caused by l2cap_chan_put
        Bluetooth: Always set event mask on suspend
        Bluetooth: mgmt: Fix double free on error path
        wifi: mac80211: do not abuse fq.lock in ieee80211_do_stop()
        ice: do not setup vlan for loopback VSI
        ice: check (DD | EOF) bits on Rx descriptor rather than (EOP | RS)
        ice: Fix VSIs unable to share unicast MAC
        ice: Fix tunnel checksum offload with fragmented traffic
        ice: Fix max VLANs available for VF
        netfilter: nft_queue: only allow supported familes and hooks
        ...
      33ea1340
    • Dan Carpenter's avatar
      stmmac: dwmac-mediatek: fix resource leak in probe · 4d3d3a1b
      Dan Carpenter authored
      If mediatek_dwmac_clks_config() fails, then call stmmac_remove_config_dt()
      before returning.  Otherwise it is a resource leak.
      
      Fixes: fa4b3ca6
      
       ("stmmac: dwmac-mediatek: fix clock issue")
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Link: https://lore.kernel.org/r/YuJ4aZyMUlG6yGGa@kili
      
      
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      4d3d3a1b
    • Ziyang Xuan's avatar
      ipv6/addrconf: fix a null-ptr-deref bug for ip6_ptr · 85f0173d
      Ziyang Xuan authored
      Change net device's MTU to smaller than IPV6_MIN_MTU or unregister
      device while matching route. That may trigger null-ptr-deref bug
      for ip6_ptr probability as following.
      
      =========================================================
      BUG: KASAN: null-ptr-deref in find_match.part.0+0x70/0x134
      Read of size 4 at addr 0000000000000308 by task ping6/263
      
      CPU: 2 PID: 263 Comm: ping6 Not tainted 5.19.0-rc7+ #14
      Call trace:
       dump_backtrace+0x1a8/0x230
       show_stack+0x20/0x70
       dump_stack_lvl+0x68/0x84
       print_report+0xc4/0x120
       kasan_report+0x84/0x120
       __asan_load4+0x94/0xd0
       find_match.part.0+0x70/0x134
       __find_rr_leaf+0x408/0x470
       fib6_table_lookup+0x264/0x540
       ip6_pol_route+0xf4/0x260
       ip6_pol_route_output+0x58/0x70
       fib6_rule_lookup+0x1a8/0x330
       ip6_route_output_flags_noref+0xd8/0x1a0
       ip6_route_output_flags+0x58/0x160
       ip6_dst_lookup_tail+0x5b4/0x85c
       ip6_dst_lookup_flow+0x98/0x120
       rawv6_sendmsg+0x49c/0xc70
       inet_sendmsg+0x68/0x94
      
      Reproducer as following:
      Firstly, prepare conditions:
      $ip netns add ns1
      $ip netns add ns2
      $ip link add veth1 type veth peer name veth2
      $ip link set veth1 netns ns1
      $ip link set veth2 netns ns2
      $ip netns exec ns1 ip -6 addr add 2001:0db8:0:f101::1/64 dev veth1
      $ip netns exec ns2 ip -6 addr add 2001:0db8:0:f101::2/64 dev veth2
      $ip netns exec ns1 ifconfig veth1 up
      $ip netns exec ns2 ifconfig veth2 up
      $ip netns exec ns1 ip -6 route add 2000::/64 dev veth1 metric 1
      $ip netns exec ns2 ip -6 route add 2001::/64 dev veth2 metric 1
      
      Secondly, execute the following two commands in two ssh windows
      respectively:
      $ip netns exec ns1 sh
      $while true; do ip -6 addr add 2001:0db8:0:f101::1/64 dev veth1; ip -6 route add 2000::/64 dev veth1 metric 1; ping6 2000::2; done
      
      $ip netns exec ns1 sh
      $while true; do ip link set veth1 mtu 1000; ip link set veth1 mtu 1500; sleep 5; done
      
      It is because ip6_ptr has been assigned to NULL in addrconf_ifdown() firstly,
      then ip6_ignore_linkdown() accesses ip6_ptr directly without NULL check.
      
      	cpu0			cpu1
      fib6_table_lookup
      __find_rr_leaf
      			addrconf_notify [ NETDEV_CHANGEMTU ]
      			addrconf_ifdown
      			RCU_INIT_POINTER(dev->ip6_ptr, NULL)
      find_match
      ip6_ignore_linkdown
      
      So we can add NULL check for ip6_ptr before using in ip6_ignore_linkdown() to
      fix the null-ptr-deref bug.
      
      Fixes: dcd1f572
      
       ("net/ipv6: Remove fib6_idev")
      Signed-off-by: default avatarZiyang Xuan <william.xuanziyang@huawei.com>
      Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
      Link: https://lore.kernel.org/r/20220728013307.656257-1-william.xuanziyang@huawei.com
      
      
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      85f0173d
    • Kuniyuki Iwashima's avatar
      net: ping6: Fix memleak in ipv6_renew_options(). · e2732600
      Kuniyuki Iwashima authored
      When we close ping6 sockets, some resources are left unfreed because
      pingv6_prot is missing sk->sk_prot->destroy().  As reported by
      syzbot [0], just three syscalls leak 96 bytes and easily cause OOM.
      
          struct ipv6_sr_hdr *hdr;
          char data[24] = {0};
          int fd;
      
          hdr = (struct ipv6_sr_hdr *)data;
          hdr->hdrlen = 2;
          hdr->type = IPV6_SRCRT_TYPE_4;
      
          fd = socket(AF_INET6, SOCK_DGRAM, NEXTHDR_ICMP);
          setsockopt(fd, IPPROTO_IPV6, IPV6_RTHDR, data, 24);
          close(fd);
      
      To fix memory leaks, let's add a destroy function.
      
      Note the socket() syscall checks if the GID is within the range of
      net.ipv4.ping_group_range.  The default value is [1, 0] so that no
      GID meets the condition (1 <= GID <= 0).  Thus, the local DoS does
      not succeed until we change the default value.  However, at least
      Ubuntu/Fedora/RHEL loosen it.
      
          $ cat /usr/lib/sysctl.d/50-default.conf
          ...
          -net.ipv4.ping_group_range = 0 2147483647
      
      Also, there could be another path reported with these options, and
      some of them require CAP_NET_RAW.
      
        setsockopt
            IPV6_ADDRFORM (inet6_sk(sk)->pktoptions)
            IPV6_RECVPATHMTU (inet6_sk(sk)->rxpmtu)
            IPV6_HOPOPTS (inet6_sk(sk)->opt)
            IPV6_RTHDRDSTOPTS (inet6_sk(sk)->opt)
            IPV6_RTHDR (inet6_sk(sk)->opt)
            IPV6_DSTOPTS (inet6_sk(sk)->opt)
            IPV6_2292PKTOPTIONS (inet6_sk(sk)->opt)
      
        getsockopt
            IPV6_FLOWLABEL_MGR (inet6_sk(sk)->ipv6_fl_list)
      
      For the record, I left a different splat with syzbot's one.
      
        unreferenced object 0xffff888006270c60 (size 96):
          comm "repro2", pid 231, jiffies 4294696626 (age 13.118s)
          hex dump (first 32 bytes):
            01 00 00 00 44 00 00 00 00 00 00 00 00 00 00 00  ....D...........
            00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
          backtrace:
            [<00000000f6bc7ea9>] sock_kmalloc (net/core/sock.c:2564 net/core/sock.c:2554)
            [<000000006d699550>] do_ipv6_setsockopt.constprop.0 (net/ipv6/ipv6_sockglue.c:715)
            [<00000000c3c3b1f5>] ipv6_setsockopt (net/ipv6/ipv6_sockglue.c:1024)
            [<000000007096a025>] __sys_setsockopt (net/socket.c:2254)
            [<000000003a8ff47b>] __x64_sys_setsockopt (net/socket.c:2265 net/socket.c:2262 net/socket.c:2262)
            [<000000007c409dcb>] do_syscall_64 (arch/x86/entry/common.c:50 arch/x86/entry/common.c:80)
            [<00000000e939c4a9>] entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:120)
      
      [0]: https://syzkaller.appspot.com/bug?extid=a8430774139ec3ab7176
      
      Fixes: 6d0bfe22
      
       ("net: ipv6: Add IPv6 support to the ping socket.")
      Reported-by: default avatar <syzbot+a8430774139ec3ab7176@syzkaller.appspotmail.com>
      Reported-by: default avatarAyushman Dutta <ayudutta@amazon.com>
      Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
      Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
      Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
      Link: https://lore.kernel.org/r/20220728012220.46918-1-kuniyu@amazon.com
      
      
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      e2732600
    • Linus Torvalds's avatar
      watch_queue: Fix missing locking in add_watch_to_object() · e64ab2db
      Linus Torvalds authored
      If a watch is being added to a queue, it needs to guard against
      interference from addition of a new watch, manual removal of a watch and
      removal of a watch due to some other queue being destroyed.
      
      KEYCTL_WATCH_KEY guards against this for the same {key,queue} pair by
      holding the key->sem writelocked and by holding refs on both the key and
      the queue - but that doesn't prevent interaction from other {key,queue}
      pairs.
      
      While add_watch_to_object() does take the spinlock on the event queue,
      it doesn't take the lock on the source's watch list.  The assumption was
      that the caller would prevent that (say by taking key->sem) - but that
      doesn't prevent interference from the destruction of another queue.
      
      Fix this by locking the watcher list in add_watch_to_object().
      
      Fixes: c73be61c
      
       ("pipe: Add general notification queue support")
      Reported-by: default avatar <syzbot+03d7b43290037d1f87ca@syzkaller.appspotmail.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      cc: keyrings@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e64ab2db
    • David Howells's avatar
      watch_queue: Fix missing rcu annotation · e0339f03
      David Howells authored
      Since __post_watch_notification() walks wlist->watchers with only the
      RCU read lock held, we need to use RCU methods to add to the list (we
      already use RCU methods to remove from the list).
      
      Fix add_watch_to_object() to use hlist_add_head_rcu() instead of
      hlist_add_head() for that list.
      
      Fixes: c73be61c
      
       ("pipe: Add general notification queue support")
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e0339f03
  2. Jul 28, 2022
  3. Jul 27, 2022