Skip to content
  1. Apr 08, 2021
  2. Apr 07, 2021
  3. Apr 06, 2021
  4. Apr 03, 2021
  5. Apr 02, 2021
    • David S. Miller's avatar
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue · 9256ce33
      David S. Miller authored
      
      
      Tony Nguyen says:
      
      ====================
      Intel Wired LAN Driver Updates 2021-04-01
      
      This series contains updates to i40e driver only.
      
      Arkadiusz fixes warnings for inconsistent indentation.
      
      Magnus fixes an issue on xsk receive where single packets over time
      are batched rather than received immediately.
      
      Eryk corrects warnings and reporting of veb-stats.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9256ce33
    • David S. Miller's avatar
      Merge branch 'mptcp-deadlock' · efd2e92d
      David S. Miller authored
      
      
      Paolo Abeni says:
      
      ====================
      mptcp: mptcp: fix deadlock in mptcp{,6}_release
      
      syzkaller has reported a few deadlock triggered by
      mptcp{,6}_release.
      
      These patches address the issue in the easy way - blocking
      the relevant, multicast related, sockopt options on MPTCP
      sockets.
      
      Note that later on net-next we are going to revert patch 1/2,
      as a part of a larger MPTCP sockopt implementation refactor
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      efd2e92d
    • Paolo Abeni's avatar
      mptcp: revert "mptcp: provide subflow aware release function" · 0a3cc579
      Paolo Abeni authored
      This change reverts commit ad98dd37 ("mptcp: provide subflow aware
      release function"). The latter introduced a deadlock spotted by
      syzkaller and is not needed anymore after the previous commit.
      
      Fixes: ad98dd37
      
       ("mptcp: provide subflow aware release function")
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0a3cc579
    • Paolo Abeni's avatar
      mptcp: forbit mcast-related sockopt on MPTCP sockets · 86581852
      Paolo Abeni authored
      Unrolling mcast state at msk dismantel time is bug prone, as
      syzkaller reported:
      
      ======================================================
      WARNING: possible circular locking dependency detected
      5.11.0-syzkaller #0 Not tainted
      ------------------------------------------------------
      syz-executor905/8822 is trying to acquire lock:
      ffffffff8d678fe8 (rtnl_mutex){+.+.}-{3:3}, at: ipv6_sock_mc_close+0xd7/0x110 net/ipv6/mcast.c:323
      
      but task is already holding lock:
      ffff888024390120 (sk_lock-AF_INET6){+.+.}-{0:0}, at: lock_sock include/net/sock.h:1600 [inline]
      ffff888024390120 (sk_lock-AF_INET6){+.+.}-{0:0}, at: mptcp6_release+0x57/0x130 net/mptcp/protocol.c:3507
      
      which lock already depends on the new lock.
      
      Instead we can simply forbit any mcast-related setsockopt
      
      Fixes: 717e79c8
      
       ("mptcp: Add setsockopt()/getsockopt() socket operations")
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      86581852
    • Pavel Skripkin's avatar
      drivers: net: fix memory leak in peak_usb_create_dev · a0b96b4a
      Pavel Skripkin authored
      
      
      syzbot reported memory leak in peak_usb.
      The problem was in case of failure after calling
      ->dev_init()[2] in peak_usb_create_dev()[1]. The data
      allocated int dev_init() wasn't freed, so simple
      ->dev_free() call fix this problem.
      
      backtrace:
          [<0000000079d6542a>] kmalloc include/linux/slab.h:552 [inline]
          [<0000000079d6542a>] kzalloc include/linux/slab.h:682 [inline]
          [<0000000079d6542a>] pcan_usb_fd_init+0x156/0x210 drivers/net/can/usb/peak_usb/pcan_usb_fd.c:868   [2]
          [<00000000c09f9057>] peak_usb_create_dev drivers/net/can/usb/peak_usb/pcan_usb_core.c:851 [inline] [1]
          [<00000000c09f9057>] peak_usb_probe+0x389/0x490 drivers/net/can/usb/peak_usb/pcan_usb_core.c:949
      
      Reported-by: default avatar <syzbot+91adee8d9ebb9193d22d@syzkaller.appspotmail.com>
      Signed-off-by: default avatarPavel Skripkin <paskripkin@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a0b96b4a
    • Norman Maurer's avatar
      net: udp: Add support for getsockopt(..., ..., UDP_GRO, ..., ...); · 98184612
      Norman Maurer authored
      Support for UDP_GRO was added in the past but the implementation for
      getsockopt was missed which did lead to an error when we tried to
      retrieve the setting for UDP_GRO. This patch adds the missing switch
      case for UDP_GRO
      
      Fixes: e20cf8d3
      
       ("udp: implement GRO for plain UDP sockets.")
      Signed-off-by: default avatarNorman Maurer <norman_maurer@apple.com>
      Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      98184612
    • Pavel Skripkin's avatar
      drivers: net: fix memory leak in atusb_probe · 6b9fbe16
      Pavel Skripkin authored
      
      
      syzbot reported memory leak in atusb_probe()[1].
      The problem was in atusb_alloc_urbs().
      Since urb is anchored, we need to release the reference
      to correctly free the urb
      
      backtrace:
          [<ffffffff82ba0466>] kmalloc include/linux/slab.h:559 [inline]
          [<ffffffff82ba0466>] usb_alloc_urb+0x66/0xe0 drivers/usb/core/urb.c:74
          [<ffffffff82ad3888>] atusb_alloc_urbs drivers/net/ieee802154/atusb.c:362 [inline][2]
          [<ffffffff82ad3888>] atusb_probe+0x158/0x820 drivers/net/ieee802154/atusb.c:1038 [1]
      
      Reported-by: default avatar <syzbot+28a246747e0a465127f3@syzkaller.appspotmail.com>
      Signed-off-by: default avatarPavel Skripkin <paskripkin@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6b9fbe16
    • Alexei Starovoitov's avatar
      Merge branch 'AF_XDP Socket Creation Fixes' · 6dcc4e38
      Alexei Starovoitov authored
      
      
      Ciara Loftus says:
      
      ====================
      
      This series fixes some issues around socket creation for AF_XDP.
      
      Patch 1 fixes a potential NULL pointer dereference in
      xsk_socket__create_shared.
      
      Patch 2 ensures that the umem passed to xsk_socket__create(_shared)
      remains unchanged in event of failure.
      
      Patch 3 makes it possible for xsk_socket__create(_shared) to
      succeed even if the rx and tx XDP rings have already been set up by
      introducing a new fields to struct xsk_umem which represent the ring
      setup status for the xsk which shares the fd with the umem.
      
      v3->v4:
      * Reduced nesting in xsk_put_ctx as suggested by Alexei.
      * Use bools instead of a u8 and flags to represent the
        ring setup status as suggested by Björn.
      
      v2->v3:
      * Instead of ignoring the return values of the setsockopt calls, introduce
        a new flag to determine whether or not to call them based on the ring
        setup status as suggested by Alexei.
      
      v1->v2:
      * Simplified restoring the _save pointers as suggested by Magnus.
      * Fixed the condition which determines whether to unmap umem rings
       when socket create fails.
      
      ====================
      
      Acked-by: default avatarBjörn Töpel <bjorn@kernel.org>
      Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
      6dcc4e38