]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sctp: avoid NULL dereference when chunk data buffer is missing
authorAlexey Simakov <bigalex934@gmail.com>
Tue, 21 Oct 2025 13:00:36 +0000 (16:00 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2025 13:04:37 +0000 (14:04 +0100)
[ Upstream commit 441f0647f7673e0e64d4910ef61a5fb8f16bfb82 ]

chunk->skb pointer is dereferenced in the if-block where it's supposed
to be NULL only.

chunk->skb can only be NULL if chunk->head_skb is not. Check for frag_list
instead and do it just before replacing chunk->skb. We're sure that
otherwise chunk->skb is non-NULL because of outer if() condition.

Fixes: 90017accff61 ("sctp: Add GSO support")
Signed-off-by: Alexey Simakov <bigalex934@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Link: https://patch.msgid.link/20251021130034.6333-1-bigalex934@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/sctp/inqueue.c

index 5c1652181805880ff9f5eaae45e0bab6b00170df..f5a7d5a38755551c99bd74cd677935982cc0155e 100644 (file)
@@ -169,13 +169,14 @@ next_chunk:
                                chunk->head_skb = chunk->skb;
 
                        /* skbs with "cover letter" */
-                       if (chunk->head_skb && chunk->skb->data_len == chunk->skb->len)
+                       if (chunk->head_skb && chunk->skb->data_len == chunk->skb->len) {
+                               if (WARN_ON(!skb_shinfo(chunk->skb)->frag_list)) {
+                                       __SCTP_INC_STATS(dev_net(chunk->skb->dev),
+                                                        SCTP_MIB_IN_PKT_DISCARDS);
+                                       sctp_chunk_free(chunk);
+                                       goto next_chunk;
+                               }
                                chunk->skb = skb_shinfo(chunk->skb)->frag_list;
-
-                       if (WARN_ON(!chunk->skb)) {
-                               __SCTP_INC_STATS(dev_net(chunk->skb->dev), SCTP_MIB_IN_PKT_DISCARDS);
-                               sctp_chunk_free(chunk);
-                               goto next_chunk;
                        }
                }