Skip to content
Permalink
Tobias-Waldekr…
Switch branches/tags

Commits on Mar 15, 2021

  1. net: dsa: Centralize validation of VLAN configuration

    There are four kinds of events that have an inpact on VLAN
    configuration of DSA ports:
    
    - Adding VLAN uppers
      (ip link add dev swp0.1 link swp0 type vlan id 1)
    
    - Bridging VLAN uppers
      (ip link set dev swp0.1 master br0)
    
    - Adding bridge VLANs
      (bridge vlan add dev swp0 vid 1)
    
    - Changes to a bridge's VLAN filtering setting
      (ip link set dev br0 type bridge vlan_filtering 1)
    
    For all of these events, we want to ensure that some invariants are
    upheld for offloaded ports belonging to our tree:
    
    - For hardware where VLAN filtering is a global setting, either all
      bridges must use VLAN filtering, or no bridge can.
    
    - For all filtering bridges, no VID may be configured on more than one
      VLAN upper. An example of a violation of this would be:
    
      .100  br0  .100
         \  / \  /
         swp0 swp1
    
      $ ip link add dev br0 type bridge vlan_filtering 1
      $ ip link add dev swp0.100 link swp0 type vlan id 100
      $ ip link set dev swp0 master br0
      $ ip link add dev swp1.100 link swp0 type vlan id 100
      $ ip link set dev swp1 master br0
    
    - For all filtering bridges, no upper VLAN may share a bridge with
      another offloaded port. An example of a violation of this would be:
    
           br0
          /  |
         /   |
      .100   |
        |    |
       swp0 swp1
    
      $ ip link add dev br0 type bridge vlan_filtering 1
      $ ip link add dev swp0.100 link swp0 type vlan id 100
      $ ip link set dev swp0.100 master br0
      $ ip link set dev swp1 master br0
    
    - For all filtering bridges, no VID that exists in the bridge may be
      used by a VLAN upper. An example of a violation of this would be:
    
          br0
         (100)
           |
      .100 |
         \ |
         swp0
    
      $ ip link add dev br0 type bridge vlan_filtering 1
      $ ip link add dev swp0.100 link swp0 type vlan id 100
      $ ip link set dev swp0 master br0
      $ bridge vlan add dev swp0 vid 100
    
    Move the validation of these invariants to a central function, and use
    it from all sites where these events are handled. This way, we ensure
    that all invariants are always checked, avoiding certain configs being
    allowed or disallowed depending on the order in which commands are
    given.
    
    Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
    wkz authored and intel-lab-lkp committed Mar 15, 2021

Commits on Mar 14, 2021

  1. flow_dissector: fix byteorder of dissected ICMP ID

    flow_dissector_key_icmp::id is of type u16 (CPU byteorder),
    ICMP header has its ID field in network byteorder obviously.
    Sparse says:
    
    net/core/flow_dissector.c:178:43: warning: restricted __be16 degrades to integer
    
    Convert ID value to CPU byteorder when storing it into
    flow_dissector_key_icmp.
    
    Fixes: 5dec597 ("flow_dissector: extract more ICMP information")
    Signed-off-by: Alexander Lobakin <alobakin@pm.me>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    solbjorn authored and davem330 committed Mar 14, 2021
  2. net: qrtr: fix a kernel-infoleak in qrtr_recvmsg()

    struct sockaddr_qrtr has a 2-byte hole, and qrtr_recvmsg() currently
    does not clear it before copying kernel data to user space.
    
    It might be too late to name the hole since sockaddr_qrtr structure is uapi.
    
    BUG: KMSAN: kernel-infoleak in kmsan_copy_to_user+0x9c/0xb0 mm/kmsan/kmsan_hooks.c:249
    CPU: 0 PID: 29705 Comm: syz-executor.3 Not tainted 5.11.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+0x21c/0x280 lib/dump_stack.c:120
     kmsan_report+0xfb/0x1e0 mm/kmsan/kmsan_report.c:118
     kmsan_internal_check_memory+0x202/0x520 mm/kmsan/kmsan.c:402
     kmsan_copy_to_user+0x9c/0xb0 mm/kmsan/kmsan_hooks.c:249
     instrument_copy_to_user include/linux/instrumented.h:121 [inline]
     _copy_to_user+0x1ac/0x270 lib/usercopy.c:33
     copy_to_user include/linux/uaccess.h:209 [inline]
     move_addr_to_user+0x3a2/0x640 net/socket.c:237
     ____sys_recvmsg+0x696/0xd50 net/socket.c:2575
     ___sys_recvmsg net/socket.c:2610 [inline]
     do_recvmmsg+0xa97/0x22d0 net/socket.c:2710
     __sys_recvmmsg net/socket.c:2789 [inline]
     __do_sys_recvmmsg net/socket.c:2812 [inline]
     __se_sys_recvmmsg+0x24a/0x410 net/socket.c:2805
     __x64_sys_recvmmsg+0x62/0x80 net/socket.c:2805
     do_syscall_64+0x9f/0x140 arch/x86/entry/common.c:48
     entry_SYSCALL_64_after_hwframe+0x44/0xa9
    RIP: 0033:0x465f69
    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:00007f43659d6188 EFLAGS: 00000246 ORIG_RAX: 000000000000012b
    RAX: ffffffffffffffda RBX: 000000000056bf60 RCX: 0000000000465f69
    RDX: 0000000000000008 RSI: 0000000020003e40 RDI: 0000000000000003
    RBP: 00000000004bfa8f R08: 0000000000000000 R09: 0000000000000000
    R10: 0000000000010060 R11: 0000000000000246 R12: 000000000056bf60
    R13: 0000000000a9fb1f R14: 00007f43659d6300 R15: 0000000000022000
    
    Local variable ----addr@____sys_recvmsg created at:
     ____sys_recvmsg+0x168/0xd50 net/socket.c:2550
     ____sys_recvmsg+0x168/0xd50 net/socket.c:2550
    
    Bytes 2-3 of 12 are uninitialized
    Memory access of size 12 starts at ffff88817c627b40
    Data copied to user address 0000000020000140
    
    Fixes: bdabad3 ("net: Add Qualcomm IPC router")
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Courtney Cavin <courtney.cavin@sonymobile.com>
    Reported-by: syzbot <syzkaller@googlegroups.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    neebe000 authored and davem330 committed Mar 14, 2021
  3. net: arcnet: com20020 fix error handling

    There are two issues when handling error case in com20020pci_probe()
    
    1. priv might be not initialized yet when calling com20020pci_remove()
    from com20020pci_probe(), since the priv is set at the very last but it
    can jump to error handling in the middle and priv remains NULL.
    2. memory leak - the net device is allocated in alloc_arcdev but not
    properly released if error happens in the middle of the big for loop
    
    [    1.529110] BUG: kernel NULL pointer dereference, address: 0000000000000008
    [    1.531447] RIP: 0010:com20020pci_remove+0x15/0x60 [com20020_pci]
    [    1.536805] Call Trace:
    [    1.536939]  com20020pci_probe+0x3f2/0x48c [com20020_pci]
    [    1.537226]  local_pci_probe+0x48/0x80
    [    1.539918]  com20020pci_init+0x3f/0x1000 [com20020_pci]
    
    Signed-off-by: Tong Zhang <ztong0001@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    lzto authored and davem330 committed Mar 14, 2021
  4. devlink: fix typo in documentation

    This commit fixes three spelling typos in devlink-dpipe.rst and
    devlink-port.rst.
    
    Signed-off-by: Eva Dengler <eva.dengler@fau.de>
    Acked-by: Randy Dunlap <rdunlap@infradead.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    horscchtey authored and davem330 committed Mar 14, 2021

Commits on Mar 13, 2021

  1. net: ipa: terminate message handler arrays

    When a QMI handle is initialized, an array of message handler
    structures is provided, defining how any received message should
    be handled based on its type and message ID.  The QMI core code
    traverses this array when a message arrives and calls the function
    associated with the (type, msg_id) found in the array.
    
    The array is supposed to be terminated with an empty (all zero)
    entry though.  Without it, an unsupported message will cause
    the QMI core code to go past the end of the array.
    
    Fix this bug, by properly terminating the message handler arrays
    provided when QMI handles are set up by the IPA driver.
    
    Fixes: 530f921 ("soc: qcom: ipa: AP/modem communications")
    Reported-by: Sujit Kautkar <sujitka@chromium.org>
    Signed-off-by: Alex Elder <elder@linaro.org>
    Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    alexelder authored and davem330 committed Mar 13, 2021
  2. Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git

    /tnguy/net-queue
    
    Tony Nguyen says:
    
    ====================
    Intel Wired LAN Driver Updates 2021-03-12
    
    This series contains updates to ice, i40e, ixgbe and igb drivers.
    
    Magnus adjusts the return value for xsk allocation for ice. This fixes
    reporting of napi work done and matches the behavior of other Intel NIC
    drivers for xsk allocations.
    
    Maciej moves storing of the rx_offset value to after the build_skb flag
    is set as this flag affects the offset value for ice, i40e, and ixgbe.
    
    Li RongQing resolves an issue where an Rx buffer can be reused
    prematurely with XDP redirect for igb.
    ====================
    davem330 committed Mar 13, 2021
  3. ibmvnic: update MAINTAINERS

    Tom wrote most of the driver code and his experience is valuable to us.
    Add him as a Reviewer so that patches will be Cc'ed and reviewed by him.
    
    Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Lijun Pan authored and davem330 committed Mar 13, 2021
  4. selftests: mptcp: Restore packet capture option in join tests

    The join self tests previously used the '-c' command line option to
    enable creation of pcap files for the tests that run, but the change to
    allow running a subset of the join tests made overlapping use of that
    option.
    
    Restore the capture functionality with '-c' and move the syncookie test
    option to '-k'.
    
    Fixes: 1002b89 ("selftests: mptcp: add command line arguments for mptcp_join.sh")
    Acked-and-tested-by: Geliang Tang <geliangtang@gmail.com>
    Co-developed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
    Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
    Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    mjmartineau authored and davem330 committed Mar 13, 2021
  5. net: dsa: mt7530: setup core clock even in TRGMII mode

    A recent change to MIPS ralink reset logic made it so mt7530 actually
    resets the switch on platforms such as mt7621 (where bit 2 is the reset
    line for the switch). That exposed an issue where the switch would not
    function properly in TRGMII mode after a reset.
    
    Reconfigure core clock in TRGMII mode to fix the issue.
    
    Tested on Ubiquiti ER-X (MT7621) with TRGMII mode enabled.
    
    Fixes: 3f9ef77 ("MIPS: ralink: manage low reset lines")
    Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    lipnitsk authored and davem330 committed Mar 13, 2021
  6. mptcp: fix bit MPTCP_PUSH_PENDING tests

    The MPTCP_PUSH_PENDING define is 6 and these tests should be testing if
    BIT(6) is set.
    
    Fixes: c2e6048 ("mptcp: fix race in release_cb")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    error27 authored and davem330 committed Mar 13, 2021
  7. net: phy: broadcom: Fix RGMII delays for BCM50160 and BCM50610M

    The PHY driver entry for BCM50160 and BCM50610M calls
    bcm54xx_config_init() but does not call bcm54xx_config_clock_delay() in
    order to configuration appropriate clock delays on the PHY, fix that.
    
    Fixes: 7333362 ("net: phy: Allow BCM5481x PHYs to setup internal TX/RX clock delay")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    ffainelli authored and davem330 committed Mar 13, 2021
  8. ftgmac100: Restart MAC HW once

    The interrupt handler may set the flag to reset the mac in the future,
    but that flag is not cleared once the reset has occurred.
    
    Fixes: 10cbd64 ("ftgmac100: Rework NAPI & interrupts handling")
    Signed-off-by: Dylan Hung <dylan_hung@aspeedtech.com>
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Reviewed-by: Joel Stanley <joel@jms.id.au>
    Signed-off-by: Joel Stanley <joel@jms.id.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    aspeeddylan authored and davem330 committed Mar 13, 2021
  9. net: axienet: Fix probe error cleanup

    The driver did not always clean up all allocated resources when probe
    failed. Fix the probe cleanup path to clean up everything that was
    allocated.
    
    Fixes: 57baf8c ("net: axienet: Handle deferred probe on clock properly")
    Signed-off-by: Robert Hancock <robert.hancock@calian.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    robhancocksed authored and davem330 committed Mar 13, 2021

Commits on Mar 12, 2021

  1. net: correct sk_acceptq_is_full()

    The "backlog" argument in listen() specifies
    the maximom length of pending connections,
    so the accept queue should be considered full
    if there are exactly "backlog" elements.
    
    Signed-off-by: liuyacan <yacanliu@163.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    liuyacan authored and davem330 committed Mar 12, 2021
  2. Revert "net: bonding: fix error return code of bond_neigh_init()"

    This reverts commit 2055a99.
    
    This change rejects legitimate configurations.
    
    A slave doesn't need to exist nor implement ndo_slave_setup.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Mar 12, 2021
  3. igb: avoid premature Rx buffer reuse

    Igb needs a similar fix as commit 75aab4e ("i40e: avoid
    premature Rx buffer reuse")
    
    The page recycle code, incorrectly, relied on that a page fragment
    could not be freed inside xdp_do_redirect(). This assumption leads to
    that page fragments that are used by the stack/XDP redirect can be
    reused and overwritten.
    
    To avoid this, store the page count prior invoking xdp_do_redirect().
    
    Longer explanation:
    
    Intel NICs have a recycle mechanism. The main idea is that a page is
    split into two parts. One part is owned by the driver, one part might
    be owned by someone else, such as the stack.
    
    t0: Page is allocated, and put on the Rx ring
                  +---------------
    used by NIC ->| upper buffer
    (rx_buffer)   +---------------
                  | lower buffer
                  +---------------
      page count  == USHRT_MAX
      rx_buffer->pagecnt_bias == USHRT_MAX
    
    t1: Buffer is received, and passed to the stack (e.g.)
                  +---------------
                  | upper buff (skb)
                  +---------------
    used by NIC ->| lower buffer
    (rx_buffer)   +---------------
      page count  == USHRT_MAX
      rx_buffer->pagecnt_bias == USHRT_MAX - 1
    
    t2: Buffer is received, and redirected
                  +---------------
                  | upper buff (skb)
                  +---------------
    used by NIC ->| lower buffer
    (rx_buffer)   +---------------
    
    Now, prior calling xdp_do_redirect():
      page count  == USHRT_MAX
      rx_buffer->pagecnt_bias == USHRT_MAX - 2
    
    This means that buffer *cannot* be flipped/reused, because the skb is
    still using it.
    
    The problem arises when xdp_do_redirect() actually frees the
    segment. Then we get:
      page count  == USHRT_MAX - 1
      rx_buffer->pagecnt_bias == USHRT_MAX - 2
    
    From a recycle perspective, the buffer can be flipped and reused,
    which means that the skb data area is passed to the Rx HW ring!
    
    To work around this, the page count is stored prior calling
    xdp_do_redirect().
    
    Fixes: 9cbc948 ("igb: add XDP support")
    Signed-off-by: Li RongQing <lirongqing@baidu.com>
    Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
    Tested-by: Vishakha Jambekar <vishakha.jambekar@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    lrq-max authored and anguy11 committed Mar 12, 2021
  4. ixgbe: move headroom initialization to ixgbe_configure_rx_ring

    ixgbe_rx_offset(), that is supposed to initialize the Rx buffer headroom,
    relies on __IXGBE_RX_BUILD_SKB_ENABLED flag.
    
    Currently, the callsite of mentioned function is placed incorrectly
    within ixgbe_setup_rx_resources() where Rx ring's build skb flag is not
    set yet. This causes the XDP_REDIRECT to be partially broken due to
    inability to create xdp_frame in the headroom space, as the headroom is
    0.
    
    Fix this by moving ixgbe_rx_offset() to ixgbe_configure_rx_ring() after
    the flag setting, which happens to be set in ixgbe_set_rx_buffer_len.
    
    Fixes: c0d4e9d ("ixgbe: store the result of ixgbe_rx_offset() onto ixgbe_ring")
    Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
    Tested-by: Vishakha Jambekar <vishakha.jambekar@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    mfijalko authored and anguy11 committed Mar 12, 2021
  5. ice: move headroom initialization to ice_setup_rx_ctx

    ice_rx_offset(), that is supposed to initialize the Rx buffer headroom,
    relies on ICE_RX_FLAGS_RING_BUILD_SKB flag as well as XDP prog presence.
    
    Currently, the callsite of mentioned function is placed incorrectly
    within ice_setup_rx_ring() where Rx ring's build skb flag is not
    set yet. This causes the XDP_REDIRECT to be partially broken due to
    inability to create xdp_frame in the headroom space, as the headroom is
    0.
    
    Fix this by moving ice_rx_offset() to ice_setup_rx_ctx() after the flag
    setting.
    
    Fixes: f1b1f40 ("ice: store the result of ice_rx_offset() onto ice_ring")
    Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
    Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    mfijalko authored and anguy11 committed Mar 12, 2021
  6. i40e: move headroom initialization to i40e_configure_rx_ring

    i40e_rx_offset(), that is supposed to initialize the Rx buffer headroom,
    relies on I40E_RXR_FLAGS_BUILD_SKB_ENABLED flag.
    
    Currently, the callsite of mentioned function is placed incorrectly
    within i40e_setup_rx_descriptors() where Rx ring's build skb flag is not
    set yet. This causes the XDP_REDIRECT to be partially broken due to
    inability to create xdp_frame in the headroom space, as the headroom is
    0.
    
    For the record, below is the call graph:
    
    i40e_vsi_open
     i40e_vsi_setup_rx_resources
      i40e_setup_rx_descriptors
       i40e_rx_offset() <-- sets offset to 0 as build_skb flag is set below
    
     i40e_vsi_configure_rx
      i40e_configure_rx_ring
       set_ring_build_skb_enabled(ring) <-- set build_skb flag
    
    Fix this by moving i40e_rx_offset() to i40e_configure_rx_ring() after
    the flag setting.
    
    Fixes: f7bb0d7 ("i40e: store the result of i40e_rx_offset() onto i40e_ring")
    Reported-by: Jesper Dangaard Brouer <brouer@redhat.com>
    Co-developed-by: Jesper Dangaard Brouer <brouer@redhat.com>
    Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
    Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
    Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
    Tested-by: Jesper Dangaard Brouer <brouer@redhat.com>
    Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    mfijalko authored and anguy11 committed Mar 12, 2021
  7. ice: fix napi work done reporting in xsk path

    Fix the wrong napi work done reporting in the xsk path of the ice
    driver. The code in the main Rx processing loop was written to assume
    that the buffer allocation code returns true if all allocations where
    successful and false if not. In contrast with all other Intel NIC xsk
    drivers, the ice_alloc_rx_bufs_zc() has the inverted logic messing up
    the work done reporting in the napi loop.
    
    This can be fixed either by inverting the return value from
    ice_alloc_rx_bufs_zc() in the function that uses this in an incorrect
    way, or by changing the return value of ice_alloc_rx_bufs_zc(). We
    chose the latter as it makes all the xsk allocation functions for
    Intel NICs behave in the same way. My guess is that it was this
    unexpected discrepancy that gave rise to this bug in the first place.
    
    Fixes: 5bb0c4b ("ice, xsk: Move Rx allocation out of while-loop")
    Reported-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
    Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
    Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    magnus-karlsson authored and anguy11 committed Mar 12, 2021
  8. Merge branch 'htb-fixes'

    Maxim Mikityanskiy says:
    
    ====================
    Bugfixes for HTB
    
    The HTB offload feature introduced a few bugs in HTB. One affects the
    non-offload mode, preventing attaching qdiscs to HTB classes, and the
    other affects the error flow, when the netdev doesn't support the
    offload, but it was requested. This short series fixes them.
    ====================
    
    Acked-by: Cong Wang <cong.wang@bytedance.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Mar 12, 2021
  9. sch_htb: Fix offload cleanup in htb_destroy on htb_init failure

    htb_init may fail to do the offload if it's not supported or if a
    runtime error happens when allocating direct qdiscs. In those cases
    TC_HTB_CREATE command is not sent to the driver, however, htb_destroy
    gets called anyway and attempts to send TC_HTB_DESTROY.
    
    It shouldn't happen, because the driver didn't receive TC_HTB_CREATE,
    and also because the driver may not support ndo_setup_tc at all, while
    q->offload is true, and htb_destroy mistakenly thinks the offload is
    supported. Trying to call ndo_setup_tc in the latter case will lead to a
    NULL pointer dereference.
    
    This commit fixes the issues with htb_destroy by deferring assignment of
    q->offload until after the TC_HTB_CREATE command. The necessary cleanup
    of the offload entities is already done in htb_init.
    
    Reported-by: syzbot+b53a709f04722ca12a3c@syzkaller.appspotmail.com
    Fixes: d03b195 ("sch_htb: Hierarchical QoS hardware offload")
    Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
    Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    nvmmax authored and davem330 committed Mar 12, 2021
  10. sch_htb: Fix select_queue for non-offload mode

    htb_select_queue assumes it's always the offload mode, and it ends up in
    calling ndo_setup_tc without any checks. It may lead to a NULL pointer
    dereference if ndo_setup_tc is not implemented, or to an error returned
    from the driver, which will prevent attaching qdiscs to HTB classes in
    the non-offload mode.
    
    This commit fixes the bug by adding the missing check to
    htb_select_queue. In the non-offload mode it will return sch->dev_queue,
    mimicking tc_modify_qdisc's behavior for the case where select_queue is
    not implemented.
    
    Reported-by: syzbot+b53a709f04722ca12a3c@syzkaller.appspotmail.com
    Fixes: d03b195 ("sch_htb: Hierarchical QoS hardware offload")
    Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
    Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    nvmmax authored and davem330 committed Mar 12, 2021
  11. net: phy: broadcom: Add power down exit reset state delay

    Per the datasheet, when we clear the power down bit, the PHY remains in
    an internal reset state for 40us and then resume normal operation.
    Account for that delay to avoid any issues in the future if
    genphy_resume() changes.
    
    Fixes: fe26821 ("net: phy: broadcom: Wire suspend/resume for BCM54810")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    ffainelli authored and davem330 committed Mar 12, 2021
  12. mISDN: fix crash in fritzpci

    setup_fritz() in avmfritz.c might fail with -EIO and in this case the
    isac.type and isac.write_reg is not initialized and remains 0(NULL).
    A subsequent call to isac_release() will dereference isac->write_reg and
    crash.
    
    [    1.737444] BUG: kernel NULL pointer dereference, address: 0000000000000000
    [    1.737809] #PF: supervisor instruction fetch in kernel mode
    [    1.738106] #PF: error_code(0x0010) - not-present page
    [    1.738378] PGD 0 P4D 0
    [    1.738515] Oops: 0010 [#1] SMP NOPTI
    [    1.738711] CPU: 0 PID: 180 Comm: systemd-udevd Not tainted 5.12.0-rc2+ torvalds#78
    [    1.739077] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-48-gd9c812dda519-p
    rebuilt.qemu.org 04/01/2014
    [    1.739664] RIP: 0010:0x0
    [    1.739807] Code: Unable to access opcode bytes at RIP 0xffffffffffffffd6.
    [    1.740200] RSP: 0018:ffffc9000027ba10 EFLAGS: 00010202
    [    1.740478] RAX: 0000000000000000 RBX: ffff888102f41840 RCX: 0000000000000027
    [    1.740853] RDX: 00000000000000ff RSI: 0000000000000020 RDI: ffff888102f41800
    [    1.741226] RBP: ffffc9000027ba20 R08: ffff88817bc18440 R09: ffffc9000027b808
    [    1.741600] R10: 0000000000000001 R11: 0000000000000001 R12: ffff888102f41840
    [    1.741976] R13: 00000000fffffffb R14: ffff888102f41800 R15: ffff8881008b0000
    [    1.742351] FS:  00007fda3a38a8c0(0000) GS:ffff88817bc00000(0000) knlGS:0000000000000000
    [    1.742774] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
    [    1.743076] CR2: ffffffffffffffd6 CR3: 00000001021ec000 CR4: 00000000000006f0
    [    1.743452] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    [    1.743828] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
    [    1.744206] Call Trace:
    [    1.744339]  isac_release+0xcc/0xe0 [mISDNipac]
    [    1.744582]  fritzpci_probe.cold+0x282/0x739 [avmfritz]
    [    1.744861]  local_pci_probe+0x48/0x80
    [    1.745063]  pci_device_probe+0x10f/0x1c0
    [    1.745278]  really_probe+0xfb/0x420
    [    1.745471]  driver_probe_device+0xe9/0x160
    [    1.745693]  device_driver_attach+0x5d/0x70
    [    1.745917]  __driver_attach+0x8f/0x150
    [    1.746123]  ? device_driver_attach+0x70/0x70
    [    1.746354]  bus_for_each_dev+0x7e/0xc0
    [    1.746560]  driver_attach+0x1e/0x20
    [    1.746751]  bus_add_driver+0x152/0x1f0
    [    1.746957]  driver_register+0x74/0xd0
    [    1.747157]  ? 0xffffffffc00d8000
    [    1.747334]  __pci_register_driver+0x54/0x60
    [    1.747562]  AVM_init+0x36/0x1000 [avmfritz]
    [    1.747791]  do_one_initcall+0x48/0x1d0
    [    1.747997]  ? __cond_resched+0x19/0x30
    [    1.748206]  ? kmem_cache_alloc_trace+0x390/0x440
    [    1.748458]  ? do_init_module+0x28/0x250
    [    1.748669]  do_init_module+0x62/0x250
    [    1.748870]  load_module+0x23ee/0x26a0
    [    1.749073]  __do_sys_finit_module+0xc2/0x120
    [    1.749307]  ? __do_sys_finit_module+0xc2/0x120
    [    1.749549]  __x64_sys_finit_module+0x1a/0x20
    [    1.749782]  do_syscall_64+0x38/0x90
    
    Signed-off-by: Tong Zhang <ztong0001@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    lzto authored and davem330 committed Mar 12, 2021
  13. net/qlcnic: Fix a use after free in qlcnic_83xx_get_minidump_template

    In qlcnic_83xx_get_minidump_template, fw_dump->tmpl_hdr was freed by
    vfree(). But unfortunately, it is used when extended is true.
    
    Fixes: 7061b2b ("qlogic: Deletion of unnecessary checks before two function calls")
    Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Yunlongs authored and davem330 committed Mar 12, 2021
  14. Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/…

    …tnguy/net-queue
    
    Tony Nguyen says:
    
    ====================
    Intel Wired LAN Driver Updates 2021-03-11
    
    This series contains updates to igc and e1000e drivers.
    
    Sasha adds locking to reset task to prevent race condition for igc.
    
    Muhammad fixes reporting of supported pause frame as well as advertised
    pause frame for Tx/Rx off for igc.
    
    Andre fixes timestamp retrieval from the wrong timer for igc.
    
    Vitaly adds locking to reset task to prevent race condition for e1000e.
    
    Dinghao Liu adds a missed check to return on error in
    e1000_set_d0_lplu_state_82571.
    ====================
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Mar 12, 2021
  15. net: sock: simplify tw proto registration

    Introduce the new function tw_prot_init (inspired by
    req_prot_init) to simplify "proto_register" function.
    
    tw_prot_cleanup will take care of a partially initialized
    timewait_sock_ops.
    
    Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
    Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    xpu22 authored and davem330 committed Mar 12, 2021

Commits on Mar 11, 2021

  1. e1000e: Fix error handling in e1000_set_d0_lplu_state_82571

    There is one e1e_wphy() call in e1000_set_d0_lplu_state_82571
    that we have caught its return value but lack further handling.
    Check and terminate the execution flow just like other e1e_wphy()
    in this function.
    
    Fixes: bc7f75f ("[E1000E]: New pci-express e1000 driver (currently for ICH9 devices only)")
    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Acked-by: Sasha Neftin <sasha.neftin@intel.com>
    Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    dinghaoliu authored and anguy11 committed Mar 11, 2021
  2. e1000e: add rtnl_lock() to e1000_reset_task

    A possible race condition was found in e1000_reset_task,
    after discovering a similar issue in igb driver via
    commit 024a816 ("igb: reinit_locked() should be called
    with rtnl_lock").
    
    Added rtnl_lock() and rtnl_unlock() to avoid this.
    
    Fixes: bc7f75f ("[E1000E]: New pci-express e1000 driver (currently for ICH9 devices only)")
    Suggested-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Vitaly Lifshits <vitaly.lifshits@intel.com>
    Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    vlifshts authored and anguy11 committed Mar 11, 2021
  3. igc: Fix igc_ptp_rx_pktstamp()

    The comment describing the timestamps layout in the packet buffer is
    wrong and the code is actually retrieving the timestamp in Timer 1
    reference instead of Timer 0. This hasn't been a big issue so far
    because hardware is configured to report both timestamps using Timer 0
    (see IGC_SRRCTL register configuration in igc_ptp_enable_rx_timestamp()
    helper). This patch fixes the comment and the code so we retrieve the
    timestamp in Timer 0 reference as expected.
    
    This patch also takes the opportunity to get rid of the hw.mac.type check
    since it is not required.
    
    Fixes: 81b0552 ("igc: Add support for RX timestamping")
    Signed-off-by: Andre Guedes <andre.guedes@intel.com>
    Signed-off-by: Vedang Patel <vedang.patel@intel.com>
    Signed-off-by: Jithu Joseph <jithu.joseph@intel.com>
    Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
    Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    Andre Guedes authored and anguy11 committed Mar 11, 2021
  4. igc: Fix Supported Pause Frame Link Setting

    The Supported Pause Frame always display "No" even though the Advertised
    pause frame showing the correct setting based on the pause parameters via
    ethtool. Set bit in link_ksettings to "Supported" for Pause Frame.
    
    Before output:
    Supported pause frame use: No
    
    Expected output:
    Supported pause frame use: Symmetric
    
    Fixes: 8c5ad0d ("igc: Add ethtool support")
    Signed-off-by: Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli@intel.com>
    Reviewed-by: Malli C <mallikarjuna.chilakala@intel.com>
    Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
    Acked-by: Sasha Neftin <sasha.neftin@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    zulkifl3 authored and anguy11 committed Mar 11, 2021
  5. igc: Fix Pause Frame Advertising

    Fix Pause Frame Advertising when getting the advertisement via ethtool.
    Remove setting the "advertising" bit in link_ksettings during default
    case when Tx and Rx are in off state with Auto Negotiate off.
    
    Below is the original output of advertisement link during Tx and Rx off:
    Advertised pause frame use: Symmetric Receive-only
    
    Expected output:
    Advertised pause frame use: No
    
    Fixes: 8c5ad0d ("igc: Add ethtool support")
    Signed-off-by: Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli@intel.com>
    Reviewed-by: Malli C <mallikarjuna.chilakala@intel.com>
    Acked-by: Sasha Neftin <sasha.neftin@intel.com>
    Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    zulkifl3 authored and anguy11 committed Mar 11, 2021
  6. igc: reinit_locked() should be called with rtnl_lock

    This commit applies to the igc_reset_task the same changes that
    were applied to the igb driver in commit 024a816 ("igb:
    reinit_locked() should be called with rtnl_lock")
    and fix possible race in reset subtask.
    
    Fixes: 0507ef8 ("igc: Add transmit and receive fastpath and interrupt handlers")
    Suggested-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
    Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    aneftin authored and anguy11 committed Mar 11, 2021
Older