1. 05 Sep, 2024 1 commit
  2. 04 Sep, 2024 5 commits
    • Jonas Gorski's avatar
      net: bridge: br_fdb_external_learn_add(): always set EXT_LEARN · bee2ef94
      Jonas Gorski authored
      When userspace wants to take over a fdb entry by setting it as
      EXTERN_LEARNED, we set both flags BR_FDB_ADDED_BY_EXT_LEARN and
      BR_FDB_ADDED_BY_USER in br_fdb_external_learn_add().
      
      If the bridge updates the entry later because its port changed, we clear
      the BR_FDB_ADDED_BY_EXT_LEARN flag, but leave the BR_FDB_ADDED_BY_USER
      flag set.
      
      If userspace then wants to take over the entry again,
      br_fdb_external_learn_add() sees that BR_FDB_ADDED_BY_USER and skips
      setting the BR_FDB_ADDED_BY_EXT_LEARN flags, thus silently ignores the
      update.
      
      Fix this by always allowing to set BR_FDB_ADDED_BY_EXT_LEARN regardless
      if this was a user fdb entry or not.
      
      Fixes: 710ae728 ("net: bridge: Mark FDB entries that were added by user as such")
      Signed-off-by: default avatarJonas Gorski <jonas.gorski@bisdn.de>
      Acked-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
      Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
      Link: https://patch.msgid.link/20240903081958.29951-1-jonas.gorski@bisdn.deSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      bee2ef94
    • Hayes Wang's avatar
      r8152: fix the firmware doesn't work · 8487b4af
      Hayes Wang authored
      generic_ocp_write() asks the parameter "size" must be 4 bytes align.
      Therefore, write the bp would fail, if the mac->bp_num is odd. Align the
      size to 4 for fixing it. The way may write an extra bp, but the
      rtl8152_is_fw_mac_ok() makes sure the value must be 0 for the bp whose
      index is more than mac->bp_num. That is, there is no influence for the
      firmware.
      
      Besides, I check the return value of generic_ocp_write() to make sure
      everything is correct.
      
      Fixes: e5c266a6 ("r8152: set bp in bulk")
      Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
      Link: https://patch.msgid.link/20240903063333.4502-1-hayeswang@realtek.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      8487b4af
    • Kuniyuki Iwashima's avatar
      fou: Fix null-ptr-deref in GRO. · 7e419693
      Kuniyuki Iwashima authored
      We observed a null-ptr-deref in fou_gro_receive() while shutting down
      a host.  [0]
      
      The NULL pointer is sk->sk_user_data, and the offset 8 is of protocol
      in struct fou.
      
      When fou_release() is called due to netns dismantle or explicit tunnel
      teardown, udp_tunnel_sock_release() sets NULL to sk->sk_user_data.
      Then, the tunnel socket is destroyed after a single RCU grace period.
      
      So, in-flight udp4_gro_receive() could find the socket and execute the
      FOU GRO handler, where sk->sk_user_data could be NULL.
      
      Let's use rcu_dereference_sk_user_data() in fou_from_sock() and add NULL
      checks in FOU GRO handlers.
      
      [0]:
      BUG: kernel NULL pointer dereference, address: 0000000000000008
       PF: supervisor read access in kernel mode
       PF: error_code(0x0000) - not-present page
      PGD 80000001032f4067 P4D 80000001032f4067 PUD 103240067 PMD 0
      SMP PTI
      CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.10.216-204.855.amzn2.x86_64 #1
      Hardware name: Amazon EC2 c5.large/, BIOS 1.0 10/16/2017
      RIP: 0010:fou_gro_receive (net/ipv4/fou.c:233) [fou]
      Code: 41 5f c3 cc cc cc cc e8 e7 2e 69 f4 0f 1f 80 00 00 00 00 0f 1f 44 00 00 49 89 f8 41 54 48 89 f7 48 89 d6 49 8b 80 88 02 00 00 <0f> b6 48 08 0f b7 42 4a 66 25 fd fd 80 cc 02 66 89 42 4a 0f b6 42
      RSP: 0018:ffffa330c0003d08 EFLAGS: 00010297
      RAX: 0000000000000000 RBX: ffff93d9e3a6b900 RCX: 0000000000000010
      RDX: ffff93d9e3a6b900 RSI: ffff93d9e3a6b900 RDI: ffff93dac2e24d08
      RBP: ffff93d9e3a6b900 R08: ffff93dacbce6400 R09: 0000000000000002
      R10: 0000000000000000 R11: ffffffffb5f369b0 R12: ffff93dacbce6400
      R13: ffff93dac2e24d08 R14: 0000000000000000 R15: ffffffffb4edd1c0
      FS:  0000000000000000(0000) GS:ffff93daee800000(0000) knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      CR2: 0000000000000008 CR3: 0000000102140001 CR4: 00000000007706f0
      DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
      PKRU: 55555554
      Call Trace:
       <IRQ>
       ? show_trace_log_lvl (arch/x86/kernel/dumpstack.c:259)
       ? __die_body.cold (arch/x86/kernel/dumpstack.c:478 arch/x86/kernel/dumpstack.c:420)
       ? no_context (arch/x86/mm/fault.c:752)
       ? exc_page_fault (arch/x86/include/asm/irqflags.h:49 arch/x86/include/asm/irqflags.h:89 arch/x86/mm/fault.c:1435 arch/x86/mm/fault.c:1483)
       ? asm_exc_page_fault (arch/x86/include/asm/idtentry.h:571)
       ? fou_gro_receive (net/ipv4/fou.c:233) [fou]
       udp_gro_receive (include/linux/netdevice.h:2552 net/ipv4/udp_offload.c:559)
       udp4_gro_receive (net/ipv4/udp_offload.c:604)
       inet_gro_receive (net/ipv4/af_inet.c:1549 (discriminator 7))
       dev_gro_receive (net/core/dev.c:6035 (discriminator 4))
       napi_gro_receive (net/core/dev.c:6170)
       ena_clean_rx_irq (drivers/amazon/net/ena/ena_netdev.c:1558) [ena]
       ena_io_poll (drivers/amazon/net/ena/ena_netdev.c:1742) [ena]
       napi_poll (net/core/dev.c:6847)
       net_rx_action (net/core/dev.c:6917)
       __do_softirq (arch/x86/include/asm/jump_label.h:25 include/linux/jump_label.h:200 include/trace/events/irq.h:142 kernel/softirq.c:299)
       asm_call_irq_on_stack (arch/x86/entry/entry_64.S:809)
      </IRQ>
       do_softirq_own_stack (arch/x86/include/asm/irq_stack.h:27 arch/x86/include/asm/irq_stack.h:77 arch/x86/kernel/irq_64.c:77)
       irq_exit_rcu (kernel/softirq.c:393 kernel/softirq.c:423 kernel/softirq.c:435)
       common_interrupt (arch/x86/kernel/irq.c:239)
       asm_common_interrupt (arch/x86/include/asm/idtentry.h:626)
      RIP: 0010:acpi_idle_do_entry (arch/x86/include/asm/irqflags.h:49 arch/x86/include/asm/irqflags.h:89 drivers/acpi/processor_idle.c:114 drivers/acpi/processor_idle.c:575)
      Code: 8b 15 d1 3c c4 02 ed c3 cc cc cc cc 65 48 8b 04 25 40 ef 01 00 48 8b 00 a8 08 75 eb 0f 1f 44 00 00 0f 00 2d d5 09 55 00 fb f4 <fa> c3 cc cc cc cc e9 be fc ff ff 66 66 2e 0f 1f 84 00 00 00 00 00
      RSP: 0018:ffffffffb5603e58 EFLAGS: 00000246
      RAX: 0000000000004000 RBX: ffff93dac0929c00 RCX: ffff93daee833900
      RDX: ffff93daee800000 RSI: ffff93daee87dc00 RDI: ffff93daee87dc64
      RBP: 0000000000000001 R08: ffffffffb5e7b6c0 R09: 0000000000000044
      R10: ffff93daee831b04 R11: 00000000000001cd R12: 0000000000000001
      R13: ffffffffb5e7b740 R14: 0000000000000001 R15: 0000000000000000
       ? sched_clock_cpu (kernel/sched/clock.c:371)
       acpi_idle_enter (drivers/acpi/processor_idle.c:712 (discriminator 3))
       cpuidle_enter_state (drivers/cpuidle/cpuidle.c:237)
       cpuidle_enter (drivers/cpuidle/cpuidle.c:353)
       cpuidle_idle_call (kernel/sched/idle.c:158 kernel/sched/idle.c:239)
       do_idle (kernel/sched/idle.c:302)
       cpu_startup_entry (kernel/sched/idle.c:395 (discriminator 1))
       start_kernel (init/main.c:1048)
       secondary_startup_64_no_verify (arch/x86/kernel/head_64.S:310)
      Modules linked in: udp_diag tcp_diag inet_diag nft_nat ipip tunnel4 dummy fou ip_tunnel nft_masq nft_chain_nat nf_nat wireguard nft_ct curve25519_x86_64 libcurve25519_generic nf_conntrack libchacha20poly1305 nf_defrag_ipv6 nf_defrag_ipv4 nft_objref chacha_x86_64 nft_counter nf_tables nfnetlink poly1305_x86_64 ip6_udp_tunnel udp_tunnel libchacha crc32_pclmul ghash_clmulni_intel aesni_intel crypto_simd cryptd glue_helper mousedev psmouse button ena ptp pps_core crc32c_intel
      CR2: 0000000000000008
      
      Fixes: d92283e3 ("fou: change to use UDP socket GRO")
      Reported-by: default avatarAlphonse Kurian <alkurian@amazon.com>
      Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
      Link: https://patch.msgid.link/20240902173927.62706-1-kuniyu@amazon.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      7e419693
    • Guillaume Nault's avatar
      bareudp: Fix device stats updates. · 4963d234
      Guillaume Nault authored
      Bareudp devices update their stats concurrently.
      Therefore they need proper atomic increments.
      
      Fixes: 571912c6 ("net: UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc.")
      Signed-off-by: default avatarGuillaume Nault <gnault@redhat.com>
      Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
      Link: https://patch.msgid.link/04b7b9d0b480158eb3ab4366ec80aa2ab7e41fcb.1725031794.git.gnault@redhat.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      4963d234
    • Souradeep Chakrabarti's avatar
      net: mana: Fix error handling in mana_create_txq/rxq's NAPI cleanup · b6ecc662
      Souradeep Chakrabarti authored
      Currently napi_disable() gets called during rxq and txq cleanup,
      even before napi is enabled and hrtimer is initialized. It causes
      kernel panic.
      
      ? page_fault_oops+0x136/0x2b0
        ? page_counter_cancel+0x2e/0x80
        ? do_user_addr_fault+0x2f2/0x640
        ? refill_obj_stock+0xc4/0x110
        ? exc_page_fault+0x71/0x160
        ? asm_exc_page_fault+0x27/0x30
        ? __mmdrop+0x10/0x180
        ? __mmdrop+0xec/0x180
        ? hrtimer_active+0xd/0x50
        hrtimer_try_to_cancel+0x2c/0xf0
        hrtimer_cancel+0x15/0x30
        napi_disable+0x65/0x90
        mana_destroy_rxq+0x4c/0x2f0
        mana_create_rxq.isra.0+0x56c/0x6d0
        ? mana_uncfg_vport+0x50/0x50
        mana_alloc_queues+0x21b/0x320
        ? skb_dequeue+0x5f/0x80
      
      Cc: stable@vger.kernel.org
      Fixes: e1b5683f ("net: mana: Move NAPI from EQ to CQ")
      Signed-off-by: default avatarSouradeep Chakrabarti <schakrabarti@linux.microsoft.com>
      Reviewed-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
      Reviewed-by: default avatarShradha Gupta <shradhagupta@linux.microsoft.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b6ecc662
  3. 03 Sep, 2024 15 commits
  4. 02 Sep, 2024 2 commits
  5. 01 Sep, 2024 3 commits
  6. 30 Aug, 2024 9 commits
    • Luiz Augusto von Dentz's avatar
      Bluetooth: MGMT: Ignore keys being loaded with invalid type · 1e9683c9
      Luiz Augusto von Dentz authored
      Due to 59b047bc there could be keys stored
      with the wrong address type so this attempt to detect it and ignore them
      instead of just failing to load all keys.
      
      Cc: stable@vger.kernel.org
      Link: https://github.com/bluez/bluez/issues/875
      Fixes: 59b047bc ("Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE")
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      1e9683c9
    • Luiz Augusto von Dentz's avatar
      Revert "Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE" · 532f8bcd
      Luiz Augusto von Dentz authored
      This reverts commit 59b047bc which
      breaks compatibility with commands like:
      
      bluetoothd[46328]: @ MGMT Command: Load.. (0x0013) plen 74  {0x0001} [hci0]
              Keys: 2
              BR/EDR Address: C0:DC:DA:A5:E5:47 (Samsung Electronics Co.,Ltd)
              Key type: Authenticated key from P-256 (0x03)
              Central: 0x00
              Encryption size: 16
              Diversifier[2]: 0000
              Randomizer[8]: 0000000000000000
              Key[16]: 6ed96089bd9765be2f2c971b0b95f624
              LE Address: D7:2A:DE:1E:73:A2 (Static)
              Key type: Unauthenticated key from P-256 (0x02)
              Central: 0x00
              Encryption size: 16
              Diversifier[2]: 0000
              Randomizer[8]: 0000000000000000
              Key[16]: 87dd2546ededda380ffcdc0a8faa4597
      @ MGMT Event: Command Status (0x0002) plen 3                {0x0001} [hci0]
            Load Long Term Keys (0x0013)
              Status: Invalid Parameters (0x0d)
      
      Cc: stable@vger.kernel.org
      Link: https://github.com/bluez/bluez/issues/875
      Fixes: 59b047bc ("Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE")
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      532f8bcd
    • Luiz Augusto von Dentz's avatar
      Bluetooth: MGMT: Fix not generating command complete for MGMT_OP_DISCONNECT · 227a0cdf
      Luiz Augusto von Dentz authored
      MGMT_OP_DISCONNECT can be called while mgmt_device_connected has not
      been called yet, which will cause the connection procedure to be
      aborted, so mgmt_device_disconnected shall still respond with command
      complete to MGMT_OP_DISCONNECT and just not emit
      MGMT_EV_DEVICE_DISCONNECTED since MGMT_EV_DEVICE_CONNECTED was never
      sent.
      
      To fix this MGMT_OP_DISCONNECT is changed to work similarly to other
      command which do use hci_cmd_sync_queue and then use hci_conn_abort to
      disconnect and returns the result, in order for hci_conn_abort to be
      used from hci_cmd_sync context it now uses hci_cmd_sync_run_once.
      
      Link: https://github.com/bluez/bluez/issues/932
      Fixes: 12d4a3b2 ("Bluetooth: Move check for MGMT_CONNECTED flag into mgmt.c")
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      227a0cdf
    • Luiz Augusto von Dentz's avatar
      Bluetooth: hci_sync: Introduce hci_cmd_sync_run/hci_cmd_sync_run_once · c898f6d7
      Luiz Augusto von Dentz authored
      This introduces hci_cmd_sync_run/hci_cmd_sync_run_once which acts like
      hci_cmd_sync_queue/hci_cmd_sync_queue_once but runs immediately when
      already on hdev->cmd_sync_work context.
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      c898f6d7
    • Douglas Anderson's avatar
      Bluetooth: qca: If memdump doesn't work, re-enable IBS · 8ae22de9
      Douglas Anderson authored
      On systems in the field, we are seeing this sometimes in the kernel logs:
        Bluetooth: qca_controller_memdump() hci0: hci_devcd_init Return:-95
      
      This means that _something_ decided that it wanted to get a memdump
      but then hci_devcd_init() returned -EOPNOTSUPP (AKA -95).
      
      The cleanup code in qca_controller_memdump() when we get back an error
      from hci_devcd_init() undoes most things but forgets to clear
      QCA_IBS_DISABLED. One side effect of this is that, during the next
      suspend, qca_suspend() will always get a timeout.
      
      Let's fix it so that we clear the bit.
      
      Fixes: 06d3fdfc ("Bluetooth: hci_qca: Add qcom devcoredump support")
      Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
      Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
      Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      8ae22de9
    • Martin Jocic's avatar
      can: kvaser_pciefd: Use a single write when releasing RX buffers · dd885d90
      Martin Jocic authored
      Kvaser's PCIe cards uses the KCAN FPGA IP block which has dual 4K
      buffers for incoming messages shared by all (currently up to eight)
      channels. While the driver processes messages in one buffer, new
      incoming messages are stored in the other and so on.
      
      The design of KCAN is such that a buffer must be fully read and then
      released. Releasing a buffer will make the FPGA switch buffers. If the
      other buffer contains at least one incoming message the FPGA will also
      instantly issue a new interrupt, if not the interrupt will be issued
      after receiving the first new message.
      
      With IRQx interrupts, it takes a little time for the interrupt to
      happen, enough for any previous ISR call to do it's business and
      return, but MSI interrupts are way faster so this time is reduced to
      almost nothing.
      
      So with MSI, releasing the buffer HAS to be the very last action of
      the ISR before returning, otherwise the new interrupt might be
      "masked" by the kernel because the previous ISR call hasn't returned.
      And the interrupts are edge-triggered so we cannot loose one, or the
      ping-pong reading process will stop.
      
      This is why this patch modifies the driver to use a single write to
      the SRB_CMD register before returning.
      Signed-off-by: default avatarMartin Jocic <martin.jocic@kvaser.com>
      Reviewed-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
      Link: https://patch.msgid.link/20240830153113.2081440-1-martin.jocic@kvaser.com
      Fixes: 26ad340e ("can: kvaser_pciefd: Add driver for Kvaser PCIEcan devices")
      Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
      dd885d90
    • Cong Wang's avatar
      tcp_bpf: fix return value of tcp_bpf_sendmsg() · fe1910f9
      Cong Wang authored
      When we cork messages in psock->cork, the last message triggers the
      flushing will result in sending a sk_msg larger than the current
      message size. In this case, in tcp_bpf_send_verdict(), 'copied' becomes
      negative at least in the following case:
      
      468         case __SK_DROP:
      469         default:
      470                 sk_msg_free_partial(sk, msg, tosend);
      471                 sk_msg_apply_bytes(psock, tosend);
      472                 *copied -= (tosend + delta); // <==== HERE
      473                 return -EACCES;
      
      Therefore, it could lead to the following BUG with a proper value of
      'copied' (thanks to syzbot). We should not use negative 'copied' as a
      return value here.
      
        ------------[ cut here ]------------
        kernel BUG at net/socket.c:733!
        Internal error: Oops - BUG: 00000000f2000800 [#1] PREEMPT SMP
        Modules linked in:
        CPU: 0 UID: 0 PID: 3265 Comm: syz-executor510 Not tainted 6.11.0-rc3-syzkaller-00060-gd07b4328 #0
        Hardware name: linux,dummy-virt (DT)
        pstate: 61400009 (nZCv daif +PAN -UAO -TCO +DIT -SSBS BTYPE=--)
        pc : sock_sendmsg_nosec net/socket.c:733 [inline]
        pc : sock_sendmsg_nosec net/socket.c:728 [inline]
        pc : __sock_sendmsg+0x5c/0x60 net/socket.c:745
        lr : sock_sendmsg_nosec net/socket.c:730 [inline]
        lr : __sock_sendmsg+0x54/0x60 net/socket.c:745
        sp : ffff800088ea3b30
        x29: ffff800088ea3b30 x28: fbf00000062bc900 x27: 0000000000000000
        x26: ffff800088ea3bc0 x25: ffff800088ea3bc0 x24: 0000000000000000
        x23: f9f00000048dc000 x22: 0000000000000000 x21: ffff800088ea3d90
        x20: f9f00000048dc000 x19: ffff800088ea3d90 x18: 0000000000000001
        x17: 0000000000000000 x16: 0000000000000000 x15: 000000002002ffaf
        x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000000
        x11: 0000000000000000 x10: ffff8000815849c0 x9 : ffff8000815b49c0
        x8 : 0000000000000000 x7 : 000000000000003f x6 : 0000000000000000
        x5 : 00000000000007e0 x4 : fff07ffffd239000 x3 : fbf00000062bc900
        x2 : 0000000000000000 x1 : 0000000000000000 x0 : 00000000fffffdef
        Call trace:
         sock_sendmsg_nosec net/socket.c:733 [inline]
         __sock_sendmsg+0x5c/0x60 net/socket.c:745
         ____sys_sendmsg+0x274/0x2ac net/socket.c:2597
         ___sys_sendmsg+0xac/0x100 net/socket.c:2651
         __sys_sendmsg+0x84/0xe0 net/socket.c:2680
         __do_sys_sendmsg net/socket.c:2689 [inline]
         __se_sys_sendmsg net/socket.c:2687 [inline]
         __arm64_sys_sendmsg+0x24/0x30 net/socket.c:2687
         __invoke_syscall arch/arm64/kernel/syscall.c:35 [inline]
         invoke_syscall+0x48/0x110 arch/arm64/kernel/syscall.c:49
         el0_svc_common.constprop.0+0x40/0xe0 arch/arm64/kernel/syscall.c:132
         do_el0_svc+0x1c/0x28 arch/arm64/kernel/syscall.c:151
         el0_svc+0x34/0xec arch/arm64/kernel/entry-common.c:712
         el0t_64_sync_handler+0x100/0x12c arch/arm64/kernel/entry-common.c:730
         el0t_64_sync+0x19c/0x1a0 arch/arm64/kernel/entry.S:598
        Code: f9404463 d63f0060 3108441f 54fffe81 (d4210000)
        ---[ end trace 0000000000000000 ]---
      
      Fixes: 4f738adb ("bpf: create tcp_bpf_ulp allowing BPF to monitor socket TX/RX data")
      Reported-by: syzbot+58c03971700330ce14d8@syzkaller.appspotmail.com
      Cc: Jakub Sitnicki <jakub@cloudflare.com>
      Signed-off-by: default avatarCong Wang <cong.wang@bytedance.com>
      Reviewed-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
      Acked-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
      Link: https://patch.msgid.link/20240821030744.320934-1-xiyou.wangcong@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      fe1910f9
    • Jeongjun Park's avatar
      net/smc: prevent NULL pointer dereference in txopt_get · 98d4435e
      Jeongjun Park authored
      Since smc_inet6_prot does not initialize ipv6_pinfo_offset, inet6_create()
      copies an incorrect address value, sk + 0 (offset), to inet_sk(sk)->pinet6.
      
      In addition, since inet_sk(sk)->pinet6 and smc_sk(sk)->clcsock practically
      point to the same address, when smc_create_clcsk() stores the newly
      created clcsock in smc_sk(sk)->clcsock, inet_sk(sk)->pinet6 is corrupted
      into clcsock. This causes NULL pointer dereference and various other
      memory corruptions.
      
      To solve this problem, you need to initialize ipv6_pinfo_offset, add a
      smc6_sock structure, and then add ipv6_pinfo as the second member of
      the smc_sock structure.
      Reported-by: default avatarsyzkaller <syzkaller@googlegroups.com>
      Fixes: d25a92cc ("net/smc: Introduce IPPROTO_SMC")
      Signed-off-by: default avatarJeongjun Park <aha310510@gmail.com>
      Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      98d4435e
    • Jakub Kicinski's avatar
      Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue · 1bb3c548
      Jakub Kicinski authored
      Tony Nguyen says:
      
      ====================
      Intel Wired LAN Driver Updates 2024-08-28 (igb, ice)
      
      This series contains updates to igb and ice drivers.
      
      Daiwei Li restores writing the TSICR (TimeSync Interrupt Cause)
      register on 82850 devices to workaround a hardware issue for igb.
      
      Dawid detaches netdev device for reset to avoid ethtool accesses during
      reset causing NULL pointer dereferences on ice.
      
      * '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
        ice: Add netif_device_attach/detach into PF reset flow
        igb: Fix not clearing TimeSync interrupts for 82580
      ====================
      
      Link: https://patch.msgid.link/20240828225444.645154-1-anthony.l.nguyen@intel.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      1bb3c548
  7. 29 Aug, 2024 5 commits
    • Jakub Kicinski's avatar
      MAINTAINERS: exclude bluetooth and wireless DT bindings from netdev ML · b57d643a
      Jakub Kicinski authored
      We exclude wireless drivers from the netdev@ traffic, to delegate
      it to linux-wireless@, and avoid overwhelming netdev@.
      Bluetooth drivers are implicitly excluded because they live under
      drivers/bluetooth, not drivers/net.
      
      In both cases DT bindings sit under Documentation/devicetree/bindings/net/
      and aren't excluded. So if a patch series touches DT bindings
      netdev@ ends up getting CCed, and these are usually fairly boring
      series.
      Reviewed-by: default avatarSimon Horman <horms@kernel.org>
      Link: https://patch.msgid.link/20240828175821.2960423-1-kuba@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      b57d643a
    • Linus Torvalds's avatar
      Merge tag 'net-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 0dd5dd63
      Linus Torvalds authored
      Pull networking fixes from Paolo Abeni:
       "Including fixes from bluetooth, wireless and netfilter.
      
        No known outstanding regressions.
      
        Current release - regressions:
      
         - wifi: iwlwifi: fix hibernation
      
         - eth: ionic: prevent tx_timeout due to frequent doorbell ringing
      
        Previous releases - regressions:
      
         - sched: fix sch_fq incorrect behavior for small weights
      
         - wifi:
            - iwlwifi: take the mutex before running link selection
            - wfx: repair open network AP mode
      
         - netfilter: restore IP sanity checks for netdev/egress
      
         - tcp: fix forever orphan socket caused by tcp_abort
      
         - mptcp: close subflow when receiving TCP+FIN
      
         - bluetooth: fix random crash seen while removing btnxpuart driver
      
        Previous releases - always broken:
      
         - mptcp: more fixes for the in-kernel PM
      
         - eth: bonding: change ipsec_lock from spin lock to mutex
      
         - eth: mana: fix race of mana_hwc_post_rx_wqe and new hwc response
      
        Misc:
      
         - documentation: drop special comment style for net code"
      
      * tag 'net-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (57 commits)
        nfc: pn533: Add poll mod list filling check
        mailmap: update entry for Sriram Yagnaraman
        selftests: mptcp: join: check re-re-adding ID 0 signal
        mptcp: pm: ADD_ADDR 0 is not a new address
        selftests: mptcp: join: validate event numbers
        mptcp: avoid duplicated SUB_CLOSED events
        selftests: mptcp: join: check re-re-adding ID 0 endp
        mptcp: pm: fix ID 0 endp usage after multiple re-creations
        mptcp: pm: do not remove already closed subflows
        selftests: mptcp: join: no extra msg if no counter
        selftests: mptcp: join: check re-adding init endp with != id
        mptcp: pm: reset MPC endp ID when re-added
        mptcp: pm: skip connecting to already established sf
        mptcp: pm: send ACK on an active subflow
        selftests: mptcp: join: check removing ID 0 endpoint
        mptcp: pm: fix RM_ADDR ID for the initial subflow
        mptcp: pm: reuse ID 0 after delete and re-add
        net: busy-poll: use ktime_get_ns() instead of local_clock()
        sctp: fix association labeling in the duplicate COOKIE-ECHO case
        mptcp: pr_debug: add missing \n at the end
        ...
      0dd5dd63
    • Aleksandr Mishin's avatar
      nfc: pn533: Add poll mod list filling check · febccb39
      Aleksandr Mishin authored
      In case of im_protocols value is 1 and tm_protocols value is 0 this
      combination successfully passes the check
      'if (!im_protocols && !tm_protocols)' in the nfc_start_poll().
      But then after pn533_poll_create_mod_list() call in pn533_start_poll()
      poll mod list will remain empty and dev->poll_mod_count will remain 0
      which lead to division by zero.
      
      Normally no im protocol has value 1 in the mask, so this combination is
      not expected by driver. But these protocol values actually come from
      userspace via Netlink interface (NFC_CMD_START_POLL operation). So a
      broken or malicious program may pass a message containing a "bad"
      combination of protocol parameter values so that dev->poll_mod_count
      is not incremented inside pn533_poll_create_mod_list(), thus leading
      to division by zero.
      Call trace looks like:
      nfc_genl_start_poll()
        nfc_start_poll()
          ->start_poll()
          pn533_start_poll()
      
      Add poll mod list filling check.
      
      Found by Linux Verification Center (linuxtesting.org) with SVACE.
      
      Fixes: dfccd0f5 ("NFC: pn533: Add some polling entropy")
      Signed-off-by: default avatarAleksandr Mishin <amishin@t-argos.ru>
      Acked-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
      Link: https://patch.msgid.link/20240827084822.18785-1-amishin@t-argos.ruSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      febccb39
    • Paolo Abeni's avatar
      Merge tag 'nf-24-08-28' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf · 0240bceb
      Paolo Abeni authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter fixes for net
      
      The following patchset contains Netfilter fixes for net:
      
      Patch #1 sets on NFT_PKTINFO_L4PROTO for UDP packets less than 4 bytes
      payload from netdev/egress by subtracting skb_network_offset() when
      validating IPv4 packet length, otherwise 'meta l4proto udp' never
      matches.
      
      Patch #2 subtracts skb_network_offset() when validating IPv6 packet
      length for netdev/egress.
      
      netfilter pull request 24-08-28
      
      * tag 'nf-24-08-28' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
        netfilter: nf_tables_ipv6: consider network offset in netdev/egress validation
        netfilter: nf_tables: restore IP sanity checks for netdev/egress
      ====================
      
      Link: https://patch.msgid.link/20240828214708.619261-1-pablo@netfilter.orgSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      0240bceb
    • Sriram Yagnaraman's avatar