Skip to content

Conversation

@ciq-kernel-automation
Copy link

Summary

This PR has been automatically created after successful completion of all CI stages.

Commit Message(s)

xsk: check IFF_UP earlier in Tx path

jira VULN-154576
cve CVE-2023-53240
commit-author Maciej Fijalkowski <[email protected]>
commit 1596dae2f17ec5c6e8c8f0e3fec78c5ae55c1e0b
drm/i915: mark requests for GuC virtual engines to avoid use-after-free

jira VULN-157599
cve CVE-2023-53552
commit-author Andrzej Hajda <[email protected]>
commit 5eefc5307c983b59344a4cb89009819f580c84fa
net/mlx5e: Check for NOT_READY flag state after locking

jira VULN-157713
cve CVE-2023-53581
commit-author Vlad Buslov <[email protected]>
commit 65e64640e97c0f223e77f9ea69b5a46186b93470
ipv6: Fix out-of-bounds access in ipv6_find_tlv()

jira VULN-159018
cve CVE-2023-53705
commit-author Gavrilov Ilia <[email protected]>
commit 878ecb0897f4737a4c9401f3523fd49589025671
sctp: detect and prevent references to a freed transport in sendmsg

jira VULN-66665
cve CVE-2025-23142
commit-author Ricardo Cañuelo Navarro <[email protected]>
commit f1a69a940de58b16e8249dff26f74c8cc59b32be
KVM: arm64: Tear down vGIC on failed vCPU creation

jira VULN-67833
cve CVE-2025-37849
commit-author Will Deacon <[email protected]>
commit 250f25367b58d8c65a1b060a2dda037eea09a672
Bluetooth: ISO: Fix possible UAF on iso_conn_free

jira VULN-160178
cve CVE-2025-40141
commit-author Luiz Augusto von Dentz <[email protected]>
commit 9950f095d6c875dbe0c9ebfcf972ec88fdf26fc8
ASoC: Intel: bytcr_rt5640: Fix invalid quirk input mapping

jira VULN-160203
cve CVE-2025-40154
commit-author Takashi Iwai <[email protected]>
commit fba404e4b4af4f4f747bb0e41e9fff7d03c7bcc0
drm/vmwgfx: Validate command header size against SVGA_CMD_MAX_DATASIZE

jira VULN-161156
cve CVE-2025-40277
commit-author Ian Forbes <[email protected]>
commit 32b415a9dc2c212e809b7ebc2b14bc3fbda2b9af

Test Results

✅ Build Stage

✅ Boot Verification

✅ Kernel Selftests

⚠️ Test Comparison

  • Status: Skipped
  • Reason: No baseline test results available from ciqlts9_2
  • Note: Manual review recommended to ensure no regressions

🤖 This PR was automatically generated by GitHub Actions
Run ID: 21513076487

jira VULN-154576
cve CVE-2023-53240
commit-author Maciej Fijalkowski <[email protected]>
commit 1596dae

Xsk Tx can be triggered via either sendmsg() or poll() syscalls. These
two paths share a call to common function xsk_xmit() which has two
sanity checks within. A pseudo code example to show the two paths:

__xsk_sendmsg() :                       xsk_poll():
if (unlikely(!xsk_is_bound(xs)))        if (unlikely(!xsk_is_bound(xs)))
    return -ENXIO;                          return mask;
if (unlikely(need_wait))                (...)
    return -EOPNOTSUPP;                 xsk_xmit()
mark napi id
(...)
xsk_xmit()

xsk_xmit():
if (unlikely(!(xs->dev->flags & IFF_UP)))
	return -ENETDOWN;
if (unlikely(!xs->tx))
	return -ENOBUFS;

As it can be observed above, in sendmsg() napi id can be marked on
interface that was not brought up and this causes a NULL ptr
dereference:

[31757.505631] BUG: kernel NULL pointer dereference, address: 0000000000000018
[31757.512710] #PF: supervisor read access in kernel mode
[31757.517936] #PF: error_code(0x0000) - not-present page
[31757.523149] PGD 0 P4D 0
[31757.525726] Oops: 0000 [#1] PREEMPT SMP NOPTI
[31757.530154] CPU: 26 PID: 95641 Comm: xdpsock Not tainted 6.2.0-rc5+ #40
[31757.536871] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.02.01.0008.031920191559 03/19/2019
[31757.547457] RIP: 0010:xsk_sendmsg+0xde/0x180
[31757.551799] Code: 00 75 a2 48 8b 00 a8 04 75 9b 84 d2 74 69 8b 85 14 01 00 00 85 c0 75 1b 48 8b 85 28 03 00 00 48 8b 80 98 00 00 00 48 8b 40 20 <8b> 40 18 89 85 14 01 00 00 8b bd 14 01 00 00 81 ff 00 01 00 00 0f
[31757.570840] RSP: 0018:ffffc90034f27dc0 EFLAGS: 00010246
[31757.576143] RAX: 0000000000000000 RBX: ffffc90034f27e18 RCX: 0000000000000000
[31757.583389] RDX: 0000000000000001 RSI: ffffc90034f27e18 RDI: ffff88984cf3c100
[31757.590631] RBP: ffff88984714a800 R08: ffff88984714a800 R09: 0000000000000000
[31757.597877] R10: 0000000000000001 R11: 0000000000000000 R12: 00000000fffffffa
[31757.605123] R13: 0000000000000000 R14: 0000000000000003 R15: 0000000000000000
[31757.612364] FS:  00007fb4c5931180(0000) GS:ffff88afdfa00000(0000) knlGS:0000000000000000
[31757.620571] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[31757.626406] CR2: 0000000000000018 CR3: 000000184b41c003 CR4: 00000000007706e0
[31757.633648] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[31757.640894] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[31757.648139] PKRU: 55555554
[31757.650894] Call Trace:
[31757.653385]  <TASK>
[31757.655524]  sock_sendmsg+0x8f/0xa0
[31757.659077]  ? sockfd_lookup_light+0x12/0x70
[31757.663416]  __sys_sendto+0xfc/0x170
[31757.667051]  ? do_sched_setscheduler+0xdb/0x1b0
[31757.671658]  __x64_sys_sendto+0x20/0x30
[31757.675557]  do_syscall_64+0x38/0x90
[31757.679197]  entry_SYSCALL_64_after_hwframe+0x72/0xdc
[31757.687969] Code: 8e f6 ff 44 8b 4c 24 2c 4c 8b 44 24 20 41 89 c4 44 8b 54 24 28 48 8b 54 24 18 b8 2c 00 00 00 48 8b 74 24 10 8b 7c 24 08 0f 05 <48> 3d 00 f0 ff ff 77 3a 44 89 e7 48 89 44 24 08 e8 b5 8e f6 ff 48
[31757.707007] RSP: 002b:00007ffd49c73c70 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
[31757.714694] RAX: ffffffffffffffda RBX: 000055a996565380 RCX: 00007fb4c5727c16
[31757.721939] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000003
[31757.729184] RBP: 0000000000000040 R08: 0000000000000000 R09: 0000000000000000
[31757.736429] R10: 0000000000000040 R11: 0000000000000293 R12: 0000000000000000
[31757.743673] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
[31757.754940]  </TASK>

To fix this, let's make xsk_xmit a function that will be responsible for
generic Tx, where RCU is handled accordingly and pull out sanity checks
and xs->zc handling. Populate sanity checks to __xsk_sendmsg() and
xsk_poll().

Fixes: ca2e1a6 ("xsk: Mark napi_id on sendmsg()")
Fixes: 18b1ab7 ("xsk: Fix race at socket teardown")
	Signed-off-by: Maciej Fijalkowski <[email protected]>
	Reviewed-by: Alexander Lobakin <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
	Signed-off-by: Martin KaFai Lau <[email protected]>
	Signed-off-by: Daniel Borkmann <[email protected]>
(cherry picked from commit 1596dae)
	Signed-off-by: Shreeya Patel <[email protected]>
jira VULN-157599
cve CVE-2023-53552
commit-author Andrzej Hajda <[email protected]>
commit 5eefc53

References to i915_requests may be trapped by userspace inside a
sync_file or dmabuf (dma-resv) and held indefinitely across different
proceses. To counter-act the memory leaks, we try to not to keep
references from the request past their completion.
On the other side on fence release we need to know if rq->engine
is valid and points to hw engine (true for non-virtual requests).
To make it possible extra bit has been added to rq->execution_mask,
for marking virtual engines.

Fixes: bcb9aa4 ("Revert "drm/i915: Hold reference to intel_context over life of i915_request"")
	Signed-off-by: Chris Wilson <[email protected]>
	Signed-off-by: Andrzej Hajda <[email protected]>
	Reviewed-by: Andi Shyti <[email protected]>
	Signed-off-by: Andi Shyti <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit 2804106)
	Signed-off-by: Rodrigo Vivi <[email protected]>
(cherry picked from commit 5eefc53)
	Signed-off-by: Shreeya Patel <[email protected]>
jira VULN-157713
cve CVE-2023-53581
commit-author Vlad Buslov <[email protected]>
commit 65e6464

Currently the check for NOT_READY flag is performed before obtaining the
necessary lock. This opens a possibility for race condition when the flow
is concurrently removed from unready_flows list by the workqueue task,
which causes a double-removal from the list and a crash[0]. Fix the issue
by moving the flag check inside the section protected by
uplink_priv->unready_flows_lock mutex.

[0]:
[44376.389654] general protection fault, probably for non-canonical address 0xdead000000000108: 0000 [#1] SMP
[44376.391665] CPU: 7 PID: 59123 Comm: tc Not tainted 6.4.0-rc4+ #1
[44376.392984] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
[44376.395342] RIP: 0010:mlx5e_tc_del_fdb_flow+0xb3/0x340 [mlx5_core]
[44376.396857] Code: 00 48 8b b8 68 ce 02 00 e8 8a 4d 02 00 4c 8d a8 a8 01 00 00 4c 89 ef e8 8b 79 88 e1 48 8b 83 98 06 00 00 48 8b 93 90 06 00 00 <48> 89 42 08 48 89 10 48 b8 00 01 00 00 00 00 ad de 48 89 83 90 06
[44376.399167] RSP: 0018:ffff88812cc97570 EFLAGS: 00010246
[44376.399680] RAX: dead000000000122 RBX: ffff8881088e3800 RCX: ffff8881881bac00
[44376.400337] RDX: dead000000000100 RSI: ffff88812cc97500 RDI: ffff8881242f71b0
[44376.401001] RBP: ffff88811cbb0940 R08: 0000000000000400 R09: 0000000000000001
[44376.401663] R10: 0000000000000001 R11: 0000000000000000 R12: ffff88812c944000
[44376.402342] R13: ffff8881242f71a8 R14: ffff8881222b4000 R15: 0000000000000000
[44376.402999] FS:  00007f0451104800(0000) GS:ffff88852cb80000(0000) knlGS:0000000000000000
[44376.403787] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[44376.404343] CR2: 0000000000489108 CR3: 0000000123a79003 CR4: 0000000000370ea0
[44376.405004] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[44376.405665] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[44376.406339] Call Trace:
[44376.406651]  <TASK>
[44376.406939]  ? die_addr+0x33/0x90
[44376.407311]  ? exc_general_protection+0x192/0x390
[44376.407795]  ? asm_exc_general_protection+0x22/0x30
[44376.408292]  ? mlx5e_tc_del_fdb_flow+0xb3/0x340 [mlx5_core]
[44376.408876]  __mlx5e_tc_del_fdb_peer_flow+0xbc/0xe0 [mlx5_core]
[44376.409482]  mlx5e_tc_del_flow+0x42/0x210 [mlx5_core]
[44376.410055]  mlx5e_flow_put+0x25/0x50 [mlx5_core]
[44376.410529]  mlx5e_delete_flower+0x24b/0x350 [mlx5_core]
[44376.411043]  tc_setup_cb_reoffload+0x22/0x80
[44376.411462]  fl_reoffload+0x261/0x2f0 [cls_flower]
[44376.411907]  ? mlx5e_rep_indr_setup_ft_cb+0x160/0x160 [mlx5_core]
[44376.412481]  ? mlx5e_rep_indr_setup_ft_cb+0x160/0x160 [mlx5_core]
[44376.413044]  tcf_block_playback_offloads+0x76/0x170
[44376.413497]  tcf_block_unbind+0x7b/0xd0
[44376.413881]  tcf_block_setup+0x17d/0x1c0
[44376.414269]  tcf_block_offload_cmd.isra.0+0xf1/0x130
[44376.414725]  tcf_block_offload_unbind+0x43/0x70
[44376.415153]  __tcf_block_put+0x82/0x150
[44376.415532]  ingress_destroy+0x22/0x30 [sch_ingress]
[44376.415986]  qdisc_destroy+0x3b/0xd0
[44376.416343]  qdisc_graft+0x4d0/0x620
[44376.416706]  tc_get_qdisc+0x1c9/0x3b0
[44376.417074]  rtnetlink_rcv_msg+0x29c/0x390
[44376.419978]  ? rep_movs_alternative+0x3a/0xa0
[44376.420399]  ? rtnl_calcit.isra.0+0x120/0x120
[44376.420813]  netlink_rcv_skb+0x54/0x100
[44376.421192]  netlink_unicast+0x1f6/0x2c0
[44376.421573]  netlink_sendmsg+0x232/0x4a0
[44376.421980]  sock_sendmsg+0x38/0x60
[44376.422328]  ____sys_sendmsg+0x1d0/0x1e0
[44376.422709]  ? copy_msghdr_from_user+0x6d/0xa0
[44376.423127]  ___sys_sendmsg+0x80/0xc0
[44376.423495]  ? ___sys_recvmsg+0x8b/0xc0
[44376.423869]  __sys_sendmsg+0x51/0x90
[44376.424226]  do_syscall_64+0x3d/0x90
[44376.424587]  entry_SYSCALL_64_after_hwframe+0x46/0xb0
[44376.425046] RIP: 0033:0x7f045134f887
[44376.425403] Code: 0a 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b9 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 2e 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 89 54 24 1c 48 89 74 24 10
[44376.426914] RSP: 002b:00007ffd63a82b98 EFLAGS: 00000246 ORIG_RAX: 000000000000002e
[44376.427592] RAX: ffffffffffffffda RBX: 000000006481955f RCX: 00007f045134f887
[44376.428195] RDX: 0000000000000000 RSI: 00007ffd63a82c00 RDI: 0000000000000003
[44376.428796] RBP: 0000000000000000 R08: 0000000000000001 R09: 0000000000000000
[44376.429404] R10: 00007f0451208708 R11: 0000000000000246 R12: 0000000000000001
[44376.430039] R13: 0000000000409980 R14: 000000000047e538 R15: 0000000000485400
[44376.430644]  </TASK>
[44376.430907] Modules linked in: mlx5_ib mlx5_core act_mirred act_tunnel_key cls_flower vxlan dummy sch_ingress openvswitch nsh rpcrdma rdma_ucm ib_iser libiscsi scsi_transport_iscsi ib_umad rdma_cm ib_ipoib iw_cm ib_cm ib_uverbs ib_core xt_conntrack xt_MASQUERADE nf_conntrack_netlink nfnetlink xt_addrtype iptable_nat nf_nat br_netfilter rpcsec_g
ss_krb5 auth_rpcgss oid_registry overlay zram zsmalloc fuse [last unloaded: mlx5_core]
[44376.433936] ---[ end trace 0000000000000000 ]---
[44376.434373] RIP: 0010:mlx5e_tc_del_fdb_flow+0xb3/0x340 [mlx5_core]
[44376.434951] Code: 00 48 8b b8 68 ce 02 00 e8 8a 4d 02 00 4c 8d a8 a8 01 00 00 4c 89 ef e8 8b 79 88 e1 48 8b 83 98 06 00 00 48 8b 93 90 06 00 00 <48> 89 42 08 48 89 10 48 b8 00 01 00 00 00 00 ad de 48 89 83 90 06
[44376.436452] RSP: 0018:ffff88812cc97570 EFLAGS: 00010246
[44376.436924] RAX: dead000000000122 RBX: ffff8881088e3800 RCX: ffff8881881bac00
[44376.437530] RDX: dead000000000100 RSI: ffff88812cc97500 RDI: ffff8881242f71b0
[44376.438179] RBP: ffff88811cbb0940 R08: 0000000000000400 R09: 0000000000000001
[44376.438786] R10: 0000000000000001 R11: 0000000000000000 R12: ffff88812c944000
[44376.439393] R13: ffff8881242f71a8 R14: ffff8881222b4000 R15: 0000000000000000
[44376.439998] FS:  00007f0451104800(0000) GS:ffff88852cb80000(0000) knlGS:0000000000000000
[44376.440714] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[44376.441225] CR2: 0000000000489108 CR3: 0000000123a79003 CR4: 0000000000370ea0
[44376.441843] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[44376.442471] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400

Fixes: ad86755 ("net/mlx5e: Protect unready flows with dedicated lock")
	Signed-off-by: Vlad Buslov <[email protected]>
	Reviewed-by: Roi Dayan <[email protected]>
	Signed-off-by: Saeed Mahameed <[email protected]>
(cherry picked from commit 65e6464)
	Signed-off-by: Shreeya Patel <[email protected]>
jira VULN-159018
cve CVE-2023-53705
commit-author Gavrilov Ilia <[email protected]>
commit 878ecb0

optlen is fetched without checking whether there is more than one byte to parse.
It can lead to out-of-bounds access.

Found by InfoTeCS on behalf of Linux Verification Center
(linuxtesting.org) with SVACE.

Fixes: c61a404 ("[IPV6]: Find option offset by type.")
	Signed-off-by: Gavrilov Ilia <[email protected]>
	Reviewed-by: Jiri Pirko <[email protected]>
	Reviewed-by: David Ahern <[email protected]>
	Signed-off-by: David S. Miller <[email protected]>
(cherry picked from commit 878ecb0)
	Signed-off-by: Shreeya Patel <[email protected]>
jira VULN-66665
cve CVE-2025-23142
commit-author Ricardo Cañuelo Navarro <[email protected]>
commit f1a69a9

sctp_sendmsg() re-uses associations and transports when possible by
doing a lookup based on the socket endpoint and the message destination
address, and then sctp_sendmsg_to_asoc() sets the selected transport in
all the message chunks to be sent.

There's a possible race condition if another thread triggers the removal
of that selected transport, for instance, by explicitly unbinding an
address with setsockopt(SCTP_SOCKOPT_BINDX_REM), after the chunks have
been set up and before the message is sent. This can happen if the send
buffer is full, during the period when the sender thread temporarily
releases the socket lock in sctp_wait_for_sndbuf().

This causes the access to the transport data in
sctp_outq_select_transport(), when the association outqueue is flushed,
to result in a use-after-free read.

This change avoids this scenario by having sctp_transport_free() signal
the freeing of the transport, tagging it as "dead". In order to do this,
the patch restores the "dead" bit in struct sctp_transport, which was
removed in
commit 47faa1e ("sctp: remove the dead field of sctp_transport").

Then, in the scenario where the sender thread has released the socket
lock in sctp_wait_for_sndbuf(), the bit is checked again after
re-acquiring the socket lock to detect the deletion. This is done while
holding a reference to the transport to prevent it from being freed in
the process.

If the transport was deleted while the socket lock was relinquished,
sctp_sendmsg_to_asoc() will return -EAGAIN to let userspace retry the
send.

The bug was found by a private syzbot instance (see the error report [1]
and the C reproducer that triggers it [2]).

Link: https://people.igalia.com/rcn/kernel_logs/20250402__KASAN_slab-use-after-free_Read_in_sctp_outq_select_transport.txt [1]
Link: https://people.igalia.com/rcn/kernel_logs/20250402__KASAN_slab-use-after-free_Read_in_sctp_outq_select_transport__repro.c [2]
	Cc: [email protected]
Fixes: df132ef ("sctp: clear the transport of some out_chunk_list chunks in sctp_assoc_rm_peer")
	Suggested-by: Xin Long <[email protected]>
	Signed-off-by: Ricardo Cañuelo Navarro <[email protected]>
	Acked-by: Xin Long <[email protected]>
Link: https://patch.msgid.link/20250404-kasan_slab-use-after-free_read_in_sctp_outq_select_transport__20250404-v1-1-5ce4a0b78ef2@igalia.com
	Signed-off-by: Paolo Abeni <[email protected]>

(cherry picked from commit f1a69a9)
	Signed-off-by: Shreeya Patel <[email protected]>
jira VULN-67833
cve CVE-2025-37849
commit-author Will Deacon <[email protected]>
commit 250f253

If kvm_arch_vcpu_create() fails to share the vCPU page with the
hypervisor, we propagate the error back to the ioctl but leave the
vGIC vCPU data initialised. Note only does this leak the corresponding
memory when the vCPU is destroyed but it can also lead to use-after-free
if the redistributor device handling tries to walk into the vCPU.

Add the missing cleanup to kvm_arch_vcpu_create(), ensuring that the
vGIC vCPU structures are destroyed on error.

	Cc: <[email protected]>
	Cc: Marc Zyngier <[email protected]>
	Cc: Oliver Upton <[email protected]>
	Cc: Quentin Perret <[email protected]>
	Signed-off-by: Will Deacon <[email protected]>
	Reviewed-by: Marc Zyngier <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
	Signed-off-by: Oliver Upton <[email protected]>
(cherry picked from commit 250f253)
	Signed-off-by: Shreeya Patel <[email protected]>
jira VULN-160178
cve CVE-2025-40141
commit-author Luiz Augusto von Dentz <[email protected]>
commit 9950f09

This attempt to fix similar issue to sco_conn_free where if the
conn->sk is not set to NULL may lead to UAF on iso_conn_free.

Fixes: ccf74f2 ("Bluetooth: Add BTPROTO_ISO socket type")
	Signed-off-by: Luiz Augusto von Dentz <[email protected]>
(cherry picked from commit 9950f09)
	Signed-off-by: Shreeya Patel <[email protected]>
jira VULN-160203
cve CVE-2025-40154
commit-author Takashi Iwai <[email protected]>
commit fba404e

When an invalid value is passed via quirk option, currently
bytcr_rt5640 driver only shows an error message but leaves as is.
This may lead to unepxected results like OOB access.

This patch corrects the input mapping to the certain default value if
an invalid value is passed.

Fixes: 063422c ("ASoC: Intel: bytcr_rt5640: Set card long_name based on quirks")
	Signed-off-by: Takashi Iwai <[email protected]>
Message-ID: <[email protected]>
	Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit fba404e)
	Signed-off-by: Shreeya Patel <[email protected]>
jira VULN-161156
cve CVE-2025-40277
commit-author Ian Forbes <[email protected]>
commit 32b415a

This data originates from userspace and is used in buffer offset
calculations which could potentially overflow causing an out-of-bounds
access.

Fixes: 8ce75f8 ("drm/vmwgfx: Update device includes for DX device functionality")
	Reported-by: Rohit Keshri <[email protected]>
	Signed-off-by: Ian Forbes <[email protected]>
	Reviewed-by: Maaz Mombasawala <[email protected]>
	Signed-off-by: Zack Rusin <[email protected]>
Link: https://patch.msgid.link/[email protected]
(cherry picked from commit 32b415a)
	Signed-off-by: Shreeya Patel <[email protected]>
@shreeya-patel98 shreeya-patel98 requested a review from a team January 30, 2026 12:08
@github-actions
Copy link

🤖 Validation Checks In Progress Workflow run: https://github.com/ctrliq/kernel-src-tree/actions/runs/21515290063

@github-actions
Copy link

🔍 Upstream Linux Kernel Commit Check

  • ⚠️ PR commit 94fe2c25a2f (xsk: check IFF_UP earlier in Tx path) references upstream commit
    1596dae2f17e which has been referenced by a Fixes: tag in the upstream
    Linux kernel:
    e4d008d49a7 xsk: Skip polling event check for unbound socket (Yewon Choi)

This is an automated message from the kernel commit checker workflow.

@github-actions
Copy link

🔍 Interdiff Analysis

  • ⚠️ PR commit 94fe2c25a2f (xsk: check IFF_UP earlier in Tx path) → upstream 1596dae2f17e
    Differences found:
diff -u b/net/xdp/xsk.c b/net/xdp/xsk.c
--- b/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -634,6 +635,7 @@ INTERDIFF: rejected hunk from patch1, cannot diff context
 	struct sock *sk = sock->sk;
 	struct xdp_sock *xs = xdp_sk(sk);
 	struct xsk_buff_pool *pool;
+	int err;
 
 	if (unlikely(!xsk_is_bound(xs)))
 		return -ENXIO;
@@ -634,6 +635,7 @@ INTERDIFF: rejected hunk from patch2, cannot diff context
 	struct sock *sk = sock->sk;
 	struct xdp_sock *xs = xdp_sk(sk);
 	struct xsk_buff_pool *pool;
+	int err;
 
 	if (unlikely(!xsk_is_bound(xs)))
 		return -ENXIO;
@@ -728,7 +734,7 @@ INTERDIFF: rejected hunk from patch1, cannot diff context
 	if (pool->cached_need_wakeup) {
 		if (xs->zc)
 			xsk_wakeup(xs, pool->cached_need_wakeup);
-		else
+		else if (xs->tx)
 			/* Poll needs to drive Tx also in copy mode */
 			xsk_xmit(sk);
 	}
@@ -728,7 +734,7 @@ INTERDIFF: rejected hunk from patch2, cannot diff context
 	if (pool->cached_need_wakeup) {
 		if (xs->zc)
 			xsk_wakeup(xs, pool->cached_need_wakeup);
-		else
+		else if (xs->tx)
 			/* Poll needs to drive Tx also in copy mode */
 			xsk_xmit(sk);
 	}
  • ⚠️ PR commit 8fce84b9575 (sctp: detect and prevent references to a freed transport in sendmsg) → upstream f1a69a940de5
    Differences found:
diff -u b/net/sctp/socket.c b/net/sctp/socket.c
--- b/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -68,5 +68,5 @@
 /* Forward declarations for internal helper functions. */
-static bool sctp_writeable(const struct sock *sk);
+static bool sctp_writeable(struct sock *sk);
 static void sctp_wfree(struct sk_buff *skb);
 static int sctp_wait_for_sndbuf(struct sctp_association *asoc,
 				struct sctp_transport *transport,
@@ -1830,4 +1830,4 @@
 		err = sctp_wait_for_sndbuf(asoc, transport, &timeo, msg_len);
 		if (err)
 			goto err;
-		if (unlikely(sinfo->sinfo_stream >= asoc->stream.outcnt)) {
+	}

This is an automated interdiff check for backported commits.

@github-actions
Copy link

Validation checks completed successfully View full results: https://github.com/ctrliq/kernel-src-tree/actions/runs/21515290063

@roxanan1996
Copy link
Contributor

🔍 Upstream Linux Kernel Commit Check

* ⚠️ PR commit `94fe2c25a2f (xsk: check IFF_UP earlier in Tx path)` references upstream commit
  `1596dae2f17e` which has been referenced by a `Fixes:` tag in the upstream
  Linux kernel:
    e4d008d49a7 xsk: Skip polling event check for unbound socket (Yewon Choi)

This is an automated message from the kernel commit checker workflow.

Did you use the updated ciq-cherry-pick and cve_remediation scripts? It does this automatically.

@shreeya-patel98
Copy link
Collaborator

Did you use the updated ciq-cherry-pick and cve_remediation scripts? It does this automatically.

I think I haven't rebased my branch so need to still do that. For now will update it manually.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants