Skip to content

Commit ca22014

Browse files
mrprekuba-moo
authored andcommitted
kcm: fix zero-frag skb in frag_list on partial sendmsg error
Syzkaller reported a warning in kcm_write_msgs() when processing a message with a zero-fragment skb in the frag_list. When kcm_sendmsg() fills MAX_SKB_FRAGS fragments in the current skb, it allocates a new skb (tskb) and links it into the frag_list before copying data. If the copy subsequently fails (e.g. -EFAULT from user memory), tskb remains in the frag_list with zero fragments: head skb (msg being assembled, NOT yet in sk_write_queue) +-----------+ | frags[17] | (MAX_SKB_FRAGS, all filled with data) | frag_list-+--> tskb +-----------+ +----------+ | frags[0] | (empty! copy failed before filling) +----------+ For SOCK_SEQPACKET with partial data already copied, the error path saves this message via partial_message for later completion. For SOCK_SEQPACKET, sock_write_iter() automatically sets MSG_EOR, so a subsequent zero-length write(fd, NULL, 0) completes the message and queues it to sk_write_queue. kcm_write_msgs() then walks the frag_list and hits: WARN_ON(!skb_shinfo(skb)->nr_frags) TCP has a similar pattern where skbs are enqueued before data copy and cleaned up on failure via tcp_remove_empty_skb(). KCM was missing the equivalent cleanup. Fix this by tracking the predecessor skb (frag_prev) when allocating a new frag_list entry. On error, if the tail skb has zero frags, use frag_prev to unlink and free it in O(1) without walking the singly-linked frag_list. frag_prev is safe to dereference because the entire message chain is only held locally (or in kcm->seq_skb) and is not added to sk_write_queue until MSG_EOR, so the send path cannot free it underneath us. Also change the WARN_ON to WARN_ON_ONCE to avoid flooding the log if the condition is somehow hit repeatedly. There are currently no KCM selftests in the kernel tree; a simple reproducer is available at [1]. [1] https://gist.github.com/mrpre/a94d431c757e8d6f168f4dd1a3749daa Reported-by: syzbot+52624bdfbf2746d37d70@syzkaller.appspotmail.com Closes: https://lore.kernel.org/all/000000000000269a1405a12fdc77@google.com/T/ Fixes: ab7ac4e ("kcm: Kernel Connection Multiplexor module") Signed-off-by: Jiayuan Chen <jiayuan.chen@shopee.com> Link: https://patch.msgid.link/20260219014256.370092-1-jiayuan.chen@linux.dev Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent fb868db commit ca22014

1 file changed

Lines changed: 19 additions & 2 deletions

File tree

net/kcm/kcmsock.c

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ static int kcm_write_msgs(struct kcm_sock *kcm)
628628
skb = txm->frag_skb;
629629
}
630630

631-
if (WARN_ON(!skb_shinfo(skb)->nr_frags) ||
631+
if (WARN_ON_ONCE(!skb_shinfo(skb)->nr_frags) ||
632632
WARN_ON_ONCE(!skb_frag_page(&skb_shinfo(skb)->frags[0]))) {
633633
ret = -EINVAL;
634634
goto out;
@@ -749,7 +749,7 @@ static int kcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
749749
{
750750
struct sock *sk = sock->sk;
751751
struct kcm_sock *kcm = kcm_sk(sk);
752-
struct sk_buff *skb = NULL, *head = NULL;
752+
struct sk_buff *skb = NULL, *head = NULL, *frag_prev = NULL;
753753
size_t copy, copied = 0;
754754
long timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
755755
int eor = (sock->type == SOCK_DGRAM) ?
@@ -824,6 +824,7 @@ static int kcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
824824
else
825825
skb->next = tskb;
826826

827+
frag_prev = skb;
827828
skb = tskb;
828829
skb->ip_summed = CHECKSUM_UNNECESSARY;
829830
continue;
@@ -933,6 +934,22 @@ static int kcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
933934
out_error:
934935
kcm_push(kcm);
935936

937+
/* When MAX_SKB_FRAGS was reached, a new skb was allocated and
938+
* linked into the frag_list before data copy. If the copy
939+
* subsequently failed, this skb has zero frags. Remove it from
940+
* the frag_list to prevent kcm_write_msgs from later hitting
941+
* WARN_ON(!skb_shinfo(skb)->nr_frags).
942+
*/
943+
if (frag_prev && !skb_shinfo(skb)->nr_frags) {
944+
if (head == frag_prev)
945+
skb_shinfo(head)->frag_list = NULL;
946+
else
947+
frag_prev->next = NULL;
948+
kfree_skb(skb);
949+
/* Update skb as it may be saved in partial_message via goto */
950+
skb = frag_prev;
951+
}
952+
936953
if (sock->type == SOCK_SEQPACKET) {
937954
/* Wrote some bytes before encountering an
938955
* error, return partial success.

0 commit comments

Comments
 (0)