Skip to content

jenkinsfile: replace manual deployment with one from library - #61

Merged
webconn merged 1 commit into
dev/v5.10.yfrom
feature/5.10.y-jenkinsfile-deploy-step
Jun 3, 2021
Merged

jenkinsfile: replace manual deployment with one from library#61
webconn merged 1 commit into
dev/v5.10.yfrom
feature/5.10.y-jenkinsfile-deploy-step

Conversation

@webconn

@webconn webconn commented May 24, 2021

Copy link
Copy Markdown
Contributor

moved deploy step to jenkins pipeline library for uniformity across different repos

@webconn
webconn requested a review from evgeny-boger May 24, 2021 09:51
@webconn
webconn merged commit be8355f into dev/v5.10.y Jun 3, 2021
@webconn
webconn deleted the feature/5.10.y-jenkinsfile-deploy-step branch June 3, 2021 08:36
evgeny-boger pushed a commit that referenced this pull request Mar 26, 2024
* wb-deb: linux 5.10

* build system integrated in kernel repository in single commit
* use static changelog
* build kernel using Jenkins pipeline with improvements

* wb-deb: add revision from changelog to uname

 * also add FORCE_OVERWRITE to upload stage

* Makefile: do not remove debian directory

* rts on rs485 uarts is configured as gpio with

* dts: disable rts-gpios on WB6 modX uarts by default (#68)

* add support for wb7 in custom build scripts

* conflict on linux-image to forbid multiple images (#77)

* fix build with recent dpkg (ubuntu 22.04)

dpkg guys really like to break backward package compatibility
every couple of years. This time newer dpkg defaults to zst compression
which is not supported by slightly older dpkg from bullsey.

* add wireguard-required packages to "Provides:" section (#129)

* add wireguard-required packages to "Provides:" section

* add wireguard-modules & wireguard-dkms packages

* remove dkms package

* wireguard-modules is only in provides

jenkinsfile: rename contactless folder to wirenboard (#59)

jenkinsfile: replace manual deployment with one from library (#61)

wb: jenkins: add wb7 to target list

Jenkinsfile: move pipeline to library (#99)

wb-deb: add debian files exceptions to .gitignore

wb: add more build artifacts to gitignore

wb build scripts: add wb7min
minimum configuration w/o Wi-Fi and with everything compiled in kernel.
add scripts to make bootpart image with zImage, dtbs and version

initial commit of bootlet in package

fix wb build scripts: add wb7min

Jenkinsfile: build bootlets by default
taraant pushed a commit that referenced this pull request May 16, 2025
Original commits:
  .gitignore
    39f9574: wb: add more build artifacts to gitignore
  .gitmodules
    97b9b0f: wb7: Add rtl8733bu wireless driver as a submodule
  Jenkinsfile
    be8355f: jenkinsfile: replace manual deployment with one from library (#61)
    2f63eae: wb: jenkins: add wb7 to target list
    3bcadf6: Jenkinsfile: move pipeline to library (#99)
    7863007: Jenkinsfile: build bootlets by default
  scripts/package/wb/builddeb
    b042223: dts: disable rts-gpios on WB6 modX uarts by default (#68)
    fc8da1c: builddeb: conflict on linux-image to forbid multiple images (#77)
    bf2dfdc: fix build with recent dpkg (ubuntu 22.04)
    f3e93d5: wb builddeb: add wireguard-required packages to "Provides:" section (#129)
  scripts/package/wb/common.sh
    efbe2be: add wb7min defconfig
  scripts/package/wb/do_build_bootpart.sh
    efbe2be: add wb7min defconfig
  scripts/package/wb/do_build_deb.sh
    7edec46: add support for wb7 in custom build scripts
    efbe2be: add wb7min defconfig
    13c5c77: initial commit of bootlet in package
    90a0ec9: scripts: make wb7x-factory-bootlet not work as regular bootlet; no functional changes
  scripts/package/wb/version.sh
    7edec46: add support for wb7 in custom build scripts
    efbe2be: add wb7min defconfig
    13c5c77: initial commit of bootlet in package
    90a0ec9: scripts: make wb7x-factory-bootlet not work as regular bootlet; no functional changes
taraant pushed a commit that referenced this pull request May 16, 2025
Original commits:
  .gitignore
    39f9574: wb: add more build artifacts to gitignore
  .gitmodules
    97b9b0f: wb7: Add rtl8733bu wireless driver as a submodule
  Jenkinsfile
    be8355f: jenkinsfile: replace manual deployment with one from library (#61)
    2f63eae: wb: jenkins: add wb7 to target list
    3bcadf6: Jenkinsfile: move pipeline to library (#99)
    7863007: Jenkinsfile: build bootlets by default
  scripts/package/wb/builddeb
    b042223: dts: disable rts-gpios on WB6 modX uarts by default (#68)
    fc8da1c: builddeb: conflict on linux-image to forbid multiple images (#77)
    bf2dfdc: fix build with recent dpkg (ubuntu 22.04)
    f3e93d5: wb builddeb: add wireguard-required packages to "Provides:" section (#129)
  scripts/package/wb/common.sh
    efbe2be: add wb7min defconfig
  scripts/package/wb/do_build_bootpart.sh
    efbe2be: add wb7min defconfig
  scripts/package/wb/do_build_deb.sh
    7edec46: add support for wb7 in custom build scripts
    efbe2be: add wb7min defconfig
    13c5c77: initial commit of bootlet in package
    90a0ec9: scripts: make wb7x-factory-bootlet not work as regular bootlet; no functional changes
  scripts/package/wb/version.sh
    7edec46: add support for wb7 in custom build scripts
    efbe2be: add wb7min defconfig
    13c5c77: initial commit of bootlet in package
    90a0ec9: scripts: make wb7x-factory-bootlet not work as regular bootlet; no functional changes
taraant pushed a commit that referenced this pull request May 16, 2025
Original commits:
  .gitignore
    39f9574: wb: add more build artifacts to gitignore
  .gitmodules
    97b9b0f: wb7: Add rtl8733bu wireless driver as a submodule
  Jenkinsfile
    be8355f: jenkinsfile: replace manual deployment with one from library (#61)
    2f63eae: wb: jenkins: add wb7 to target list
    3bcadf6: Jenkinsfile: move pipeline to library (#99)
    7863007: Jenkinsfile: build bootlets by default
  scripts/package/wb/builddeb
    b042223: dts: disable rts-gpios on WB6 modX uarts by default (#68)
    fc8da1c: builddeb: conflict on linux-image to forbid multiple images (#77)
    bf2dfdc: fix build with recent dpkg (ubuntu 22.04)
    f3e93d5: wb builddeb: add wireguard-required packages to "Provides:" section (#129)
  scripts/package/wb/common.sh
    efbe2be: add wb7min defconfig
  scripts/package/wb/do_build_bootpart.sh
    efbe2be: add wb7min defconfig
  scripts/package/wb/do_build_deb.sh
    7edec46: add support for wb7 in custom build scripts
    efbe2be: add wb7min defconfig
    13c5c77: initial commit of bootlet in package
    90a0ec9: scripts: make wb7x-factory-bootlet not work as regular bootlet; no functional changes
  scripts/package/wb/version.sh
    7edec46: add support for wb7 in custom build scripts
    efbe2be: add wb7min defconfig
    13c5c77: initial commit of bootlet in package
    90a0ec9: scripts: make wb7x-factory-bootlet not work as regular bootlet; no functional changes
taraant pushed a commit that referenced this pull request May 19, 2025
Original commits:
  .gitignore
    9d7ac38: wb-deb: linux 5.10 (#54)
    324edfb: wb-deb: add debian files exceptions to .gitignore
    39f9574: wb: add more build artifacts to gitignore
  .gitmodules
    97b9b0f: wb7: Add rtl8733bu wireless driver as a submodule
  Jenkinsfile
    9d7ac38: wb-deb: linux 5.10 (#54)
    c6a7634: jenkinsfile: rename contactless folder to wirenboard (#59)
    be8355f: jenkinsfile: replace manual deployment with one from library (#61)
    2f63eae: wb: jenkins: add wb7 to target list
    3bcadf6: Jenkinsfile: move pipeline to library (#99)
    7863007: Jenkinsfile: build bootlets by default
  scripts/Makefile.kasan
    393200a: kasan: fix hwasan build for gcc
  scripts/Makefile.package
    9d7ac38: wb-deb: linux 5.10 (#54)
  scripts/package/wb/builddeb
    9d7ac38: wb-deb: linux 5.10 (#54)
    8b7ff1b: rts on rs485 uarts is configured as gpio with default PD (#56)
    b042223: dts: disable rts-gpios on WB6 modX uarts by default (#68)
    fc8da1c: builddeb: conflict on linux-image to forbid multiple images (#77)
    bf2dfdc: fix build with recent dpkg (ubuntu 22.04)
    f3e93d5: wb builddeb: add wireguard-required packages to "Provides:" section (#129)
  scripts/package/wb/common.sh
    efbe2be: add wb7min defconfig
  scripts/package/wb/do_build_bootpart.sh
    efbe2be: add wb7min defconfig
  scripts/package/wb/do_build_deb.sh
    9d7ac38: wb-deb: linux 5.10 (#54)
    7edec46: add support for wb7 in custom build scripts
    efbe2be: add wb7min defconfig
    13c5c77: initial commit of bootlet in package
    90a0ec9: scripts: make wb7x-factory-bootlet not work as regular bootlet; no functional changes
  scripts/package/wb/version.sh
    9d7ac38: wb-deb: linux 5.10 (#54)
    7edec46: add support for wb7 in custom build scripts
    efbe2be: add wb7min defconfig
    13c5c77: initial commit of bootlet in package
    90a0ec9: scripts: make wb7x-factory-bootlet not work as regular bootlet; no functional changes
taraant pushed a commit that referenced this pull request Jul 28, 2025
… runtime

[ Upstream commit 579d4f9 ]

Assuming the "rx-vlan-filter" feature is enabled on a net device, the
8021q module will automatically add or remove VLAN 0 when the net device
is put administratively up or down, respectively. There are a couple of
problems with the above scheme.

The first problem is a memory leak that can happen if the "rx-vlan-filter"
feature is disabled while the device is running:

 # ip link add bond1 up type bond mode 0
 # ethtool -K bond1 rx-vlan-filter off
 # ip link del dev bond1

When the device is put administratively down the "rx-vlan-filter"
feature is disabled, so the 8021q module will not remove VLAN 0 and the
memory will be leaked [1].

Another problem that can happen is that the kernel can automatically
delete VLAN 0 when the device is put administratively down despite not
adding it when the device was put administratively up since during that
time the "rx-vlan-filter" feature was disabled. null-ptr-unref or
bug_on[2] will be triggered by unregister_vlan_dev() for refcount
imbalance if toggling filtering during runtime:

$ ip link add bond0 type bond mode 0
$ ip link add link bond0 name vlan0 type vlan id 0 protocol 802.1q
$ ethtool -K bond0 rx-vlan-filter off
$ ifconfig bond0 up
$ ethtool -K bond0 rx-vlan-filter on
$ ifconfig bond0 down
$ ip link del vlan0

Root cause is as below:
step1: add vlan0 for real_dev, such as bond, team.
register_vlan_dev
    vlan_vid_add(real_dev,htons(ETH_P_8021Q),0) //refcnt=1
step2: disable vlan filter feature and enable real_dev
step3: change filter from 0 to 1
vlan_device_event
    vlan_filter_push_vids
        ndo_vlan_rx_add_vid //No refcnt added to real_dev vlan0
step4: real_dev down
vlan_device_event
    vlan_vid_del(dev, htons(ETH_P_8021Q), 0); //refcnt=0
        vlan_info_rcu_free //free vlan0
step5: delete vlan0
unregister_vlan_dev
    BUG_ON(!vlan_info); //vlan_info is null

Fix both problems by noting in the VLAN info whether VLAN 0 was
automatically added upon NETDEV_UP and based on that decide whether it
should be deleted upon NETDEV_DOWN, regardless of the state of the
"rx-vlan-filter" feature.

[1]
unreferenced object 0xffff8880068e3100 (size 256):
  comm "ip", pid 384, jiffies 4296130254
  hex dump (first 32 bytes):
    00 20 30 0d 80 88 ff ff 00 00 00 00 00 00 00 00  . 0.............
    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
  backtrace (crc 81ce31fa):
    __kmalloc_cache_noprof+0x2b5/0x340
    vlan_vid_add+0x434/0x940
    vlan_device_event.cold+0x75/0xa8
    notifier_call_chain+0xca/0x150
    __dev_notify_flags+0xe3/0x250
    rtnl_configure_link+0x193/0x260
    rtnl_newlink_create+0x383/0x8e0
    __rtnl_newlink+0x22c/0xa40
    rtnl_newlink+0x627/0xb00
    rtnetlink_rcv_msg+0x6fb/0xb70
    netlink_rcv_skb+0x11f/0x350
    netlink_unicast+0x426/0x710
    netlink_sendmsg+0x75a/0xc20
    __sock_sendmsg+0xc1/0x150
    ____sys_sendmsg+0x5aa/0x7b0
    ___sys_sendmsg+0xfc/0x180

[2]
kernel BUG at net/8021q/vlan.c:99!
Oops: invalid opcode: 0000 [#1] SMP KASAN PTI
CPU: 0 UID: 0 PID: 382 Comm: ip Not tainted 6.16.0-rc3 #61 PREEMPT(voluntary)
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996),
BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
RIP: 0010:unregister_vlan_dev (net/8021q/vlan.c:99 (discriminator 1))
RSP: 0018:ffff88810badf310 EFLAGS: 00010246
RAX: 0000000000000000 RBX: ffff88810da84000 RCX: ffffffffb47ceb9a
RDX: dffffc0000000000 RSI: 0000000000000008 RDI: ffff88810e8b43c8
RBP: 0000000000000000 R08: 0000000000000000 R09: fffffbfff6cefe80
R10: ffffffffb677f407 R11: ffff88810badf3c0 R12: ffff88810e8b4000
R13: 0000000000000000 R14: ffff88810642a5c0 R15: 000000000000017e
FS:  00007f1ff68c20c0(0000) GS:ffff888163a24000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f1ff5dad240 CR3: 0000000107e56000 CR4: 00000000000006f0
Call Trace:
 <TASK>
rtnl_dellink (net/core/rtnetlink.c:3511 net/core/rtnetlink.c:3553)
rtnetlink_rcv_msg (net/core/rtnetlink.c:6945)
netlink_rcv_skb (net/netlink/af_netlink.c:2535)
netlink_unicast (net/netlink/af_netlink.c:1314 net/netlink/af_netlink.c:1339)
netlink_sendmsg (net/netlink/af_netlink.c:1883)
____sys_sendmsg (net/socket.c:712 net/socket.c:727 net/socket.c:2566)
___sys_sendmsg (net/socket.c:2622)
__sys_sendmsg (net/socket.c:2652)
do_syscall_64 (arch/x86/entry/syscall_64.c:63 arch/x86/entry/syscall_64.c:94)

Fixes: ad1afb0 ("vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)")
Reported-by: syzbot+a8b046e462915c65b10b@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=a8b046e462915c65b10b
Suggested-by: Ido Schimmel <idosch@idosch.org>
Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20250716034504.2285203-2-dongchenchen2@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
taraant pushed a commit that referenced this pull request Jul 29, 2025
… runtime

[ Upstream commit 579d4f9 ]

Assuming the "rx-vlan-filter" feature is enabled on a net device, the
8021q module will automatically add or remove VLAN 0 when the net device
is put administratively up or down, respectively. There are a couple of
problems with the above scheme.

The first problem is a memory leak that can happen if the "rx-vlan-filter"
feature is disabled while the device is running:

 # ip link add bond1 up type bond mode 0
 # ethtool -K bond1 rx-vlan-filter off
 # ip link del dev bond1

When the device is put administratively down the "rx-vlan-filter"
feature is disabled, so the 8021q module will not remove VLAN 0 and the
memory will be leaked [1].

Another problem that can happen is that the kernel can automatically
delete VLAN 0 when the device is put administratively down despite not
adding it when the device was put administratively up since during that
time the "rx-vlan-filter" feature was disabled. null-ptr-unref or
bug_on[2] will be triggered by unregister_vlan_dev() for refcount
imbalance if toggling filtering during runtime:

$ ip link add bond0 type bond mode 0
$ ip link add link bond0 name vlan0 type vlan id 0 protocol 802.1q
$ ethtool -K bond0 rx-vlan-filter off
$ ifconfig bond0 up
$ ethtool -K bond0 rx-vlan-filter on
$ ifconfig bond0 down
$ ip link del vlan0

Root cause is as below:
step1: add vlan0 for real_dev, such as bond, team.
register_vlan_dev
    vlan_vid_add(real_dev,htons(ETH_P_8021Q),0) //refcnt=1
step2: disable vlan filter feature and enable real_dev
step3: change filter from 0 to 1
vlan_device_event
    vlan_filter_push_vids
        ndo_vlan_rx_add_vid //No refcnt added to real_dev vlan0
step4: real_dev down
vlan_device_event
    vlan_vid_del(dev, htons(ETH_P_8021Q), 0); //refcnt=0
        vlan_info_rcu_free //free vlan0
step5: delete vlan0
unregister_vlan_dev
    BUG_ON(!vlan_info); //vlan_info is null

Fix both problems by noting in the VLAN info whether VLAN 0 was
automatically added upon NETDEV_UP and based on that decide whether it
should be deleted upon NETDEV_DOWN, regardless of the state of the
"rx-vlan-filter" feature.

[1]
unreferenced object 0xffff8880068e3100 (size 256):
  comm "ip", pid 384, jiffies 4296130254
  hex dump (first 32 bytes):
    00 20 30 0d 80 88 ff ff 00 00 00 00 00 00 00 00  . 0.............
    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
  backtrace (crc 81ce31fa):
    __kmalloc_cache_noprof+0x2b5/0x340
    vlan_vid_add+0x434/0x940
    vlan_device_event.cold+0x75/0xa8
    notifier_call_chain+0xca/0x150
    __dev_notify_flags+0xe3/0x250
    rtnl_configure_link+0x193/0x260
    rtnl_newlink_create+0x383/0x8e0
    __rtnl_newlink+0x22c/0xa40
    rtnl_newlink+0x627/0xb00
    rtnetlink_rcv_msg+0x6fb/0xb70
    netlink_rcv_skb+0x11f/0x350
    netlink_unicast+0x426/0x710
    netlink_sendmsg+0x75a/0xc20
    __sock_sendmsg+0xc1/0x150
    ____sys_sendmsg+0x5aa/0x7b0
    ___sys_sendmsg+0xfc/0x180

[2]
kernel BUG at net/8021q/vlan.c:99!
Oops: invalid opcode: 0000 [#1] SMP KASAN PTI
CPU: 0 UID: 0 PID: 382 Comm: ip Not tainted 6.16.0-rc3 #61 PREEMPT(voluntary)
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996),
BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
RIP: 0010:unregister_vlan_dev (net/8021q/vlan.c:99 (discriminator 1))
RSP: 0018:ffff88810badf310 EFLAGS: 00010246
RAX: 0000000000000000 RBX: ffff88810da84000 RCX: ffffffffb47ceb9a
RDX: dffffc0000000000 RSI: 0000000000000008 RDI: ffff88810e8b43c8
RBP: 0000000000000000 R08: 0000000000000000 R09: fffffbfff6cefe80
R10: ffffffffb677f407 R11: ffff88810badf3c0 R12: ffff88810e8b4000
R13: 0000000000000000 R14: ffff88810642a5c0 R15: 000000000000017e
FS:  00007f1ff68c20c0(0000) GS:ffff888163a24000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f1ff5dad240 CR3: 0000000107e56000 CR4: 00000000000006f0
Call Trace:
 <TASK>
rtnl_dellink (net/core/rtnetlink.c:3511 net/core/rtnetlink.c:3553)
rtnetlink_rcv_msg (net/core/rtnetlink.c:6945)
netlink_rcv_skb (net/netlink/af_netlink.c:2535)
netlink_unicast (net/netlink/af_netlink.c:1314 net/netlink/af_netlink.c:1339)
netlink_sendmsg (net/netlink/af_netlink.c:1883)
____sys_sendmsg (net/socket.c:712 net/socket.c:727 net/socket.c:2566)
___sys_sendmsg (net/socket.c:2622)
__sys_sendmsg (net/socket.c:2652)
do_syscall_64 (arch/x86/entry/syscall_64.c:63 arch/x86/entry/syscall_64.c:94)

Fixes: ad1afb0 ("vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)")
Reported-by: syzbot+a8b046e462915c65b10b@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=a8b046e462915c65b10b
Suggested-by: Ido Schimmel <idosch@idosch.org>
Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20250716034504.2285203-2-dongchenchen2@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
taraant pushed a commit that referenced this pull request Apr 14, 2026
[ Upstream commit 5dd8025a49c268ab6b94d978532af3ad341132a7 ]

syzbot reported a soft lockup in mptcp_recvmsg() [0].

When receiving data with MSG_PEEK | MSG_WAITALL flags, the skb is not
removed from the sk_receive_queue. This causes sk_wait_data() to always
find available data and never perform actual waiting, leading to a soft
lockup.

Fix this by adding a 'last' parameter to track the last peeked skb.
This allows sk_wait_data() to make informed waiting decisions and prevent
infinite loops when MSG_PEEK is used.

[0]:
watchdog: BUG: soft lockup - CPU#2 stuck for 156s! [server:1963]
Modules linked in:
CPU: 2 UID: 0 PID: 1963 Comm: server Not tainted 6.19.0-rc8 #61 PREEMPT(none)
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014
RIP: 0010:sk_wait_data+0x15/0x190
Code: 80 00 00 00 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 f3 0f 1e fa 41 56 41 55 41 54 49 89 f4 55 48 89 d5 53 48 89 fb <48> 83 ec 30 65 48 8b 05 17 a4 6b 01 48 89 44 24 28 31 c0 65 48 8b
RSP: 0018:ffffc90000603ca0 EFLAGS: 00000246
RAX: 0000000000000000 RBX: ffff888102bf0800 RCX: 0000000000000001
RDX: 0000000000000000 RSI: ffffc90000603d18 RDI: ffff888102bf0800
RBP: 0000000000000000 R08: 0000000000000002 R09: 0000000000000101
R10: 0000000000000000 R11: 0000000000000075 R12: ffffc90000603d18
R13: ffff888102bf0800 R14: ffff888102bf0800 R15: 0000000000000000
FS:  00007f6e38b8c4c0(0000) GS:ffff8881b877e000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 000055aa7bff1680 CR3: 0000000105cbe000 CR4: 00000000000006f0
Call Trace:
 <TASK>
 mptcp_recvmsg+0x547/0x8c0 net/mptcp/protocol.c:2329
 inet_recvmsg+0x11f/0x130 net/ipv4/af_inet.c:891
 sock_recvmsg+0x94/0xc0 net/socket.c:1100
 __sys_recvfrom+0xb2/0x130 net/socket.c:2256
 __x64_sys_recvfrom+0x1f/0x30 net/socket.c:2267
 do_syscall_64+0x59/0x2d0 arch/x86/entry/syscall_64.c:94
 entry_SYSCALL_64_after_hwframe+0x76/0x7e arch/x86/entry/entry_64.S:131
RIP: 0033:0x7f6e386a4a1d
Code: 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 8d 05 f1 de 2c 00 41 89 ca 8b 00 85 c0 75 20 45 31 c9 45 31 c0 b8 2d 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 6b f3 c3 66 0f 1f 84 00 00 00 00 00 41 56 41
RSP: 002b:00007ffc3c4bb078 EFLAGS: 00000246 ORIG_RAX: 000000000000002d
RAX: ffffffffffffffda RBX: 000000000000861e RCX: 00007f6e386a4a1d
RDX: 00000000000003ff RSI: 00007ffc3c4bb150 RDI: 0000000000000004
RBP: 00007ffc3c4bb570 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000103 R11: 0000000000000246 R12: 00005605dbc00be0
R13: 00007ffc3c4bb650 R14: 0000000000000000 R15: 0000000000000000
 </TASK>

Fixes: 8e04ce4 ("mptcp: fix MSG_PEEK stream corruption")
Signed-off-by: Li Xiasong <lixiasong1@huawei.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260330120335.659027-1-lixiasong1@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants