]> git.itanic.dy.fi Git - linux-stable/commitdiff
net: gso_test: release each segment individually
authorFlorian Westphal <fw@strlen.de>
Thu, 12 Oct 2023 12:02:37 +0000 (14:02 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Oct 2023 10:32:05 +0000 (11:32 +0100)
consume_skb() doesn't walk the segment list, so segments other than
the first are leaked.

Move this skb_consume call into the loop.

Cc: Willem de Bruijn <willemb@google.com>
Fixes: b3098d32ed6e ("net: add skb_segment kunit test")
Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/gso_test.c

index c4b13de6abfb4c5fbbecb0875c24563e7e979bbf..ceb684be4cbf862e25cabb4c46a6f2dcdb679994 100644 (file)
@@ -144,8 +144,8 @@ KUNIT_ARRAY_PARAM(gso_test, cases, gso_test_case_to_desc);
 static void gso_test_func(struct kunit *test)
 {
        const int shinfo_size = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
+       struct sk_buff *skb, *segs, *cur, *next, *last;
        const struct gso_test_case *tcase;
-       struct sk_buff *skb, *segs, *cur;
        netdev_features_t features;
        struct page *page;
        int i;
@@ -236,7 +236,10 @@ static void gso_test_func(struct kunit *test)
                goto free_gso_skb;
        }
 
-       for (cur = segs, i = 0; cur; cur = cur->next, i++) {
+       last = segs->prev;
+       for (cur = segs, i = 0; cur; cur = next, i++) {
+               next = cur->next;
+
                KUNIT_ASSERT_EQ(test, cur->len, sizeof(hdr) + tcase->segs[i]);
 
                /* segs have skb->data pointing to the mac header */
@@ -247,13 +250,14 @@ static void gso_test_func(struct kunit *test)
                KUNIT_ASSERT_EQ(test, memcmp(skb_mac_header(cur), hdr, sizeof(hdr)), 0);
 
                /* last seg can be found through segs->prev pointer */
-               if (!cur->next)
-                       KUNIT_ASSERT_PTR_EQ(test, cur, segs->prev);
+               if (!next)
+                       KUNIT_ASSERT_PTR_EQ(test, cur, last);
+
+               consume_skb(cur);
        }
 
        KUNIT_ASSERT_EQ(test, i, tcase->nr_segs);
 
-       consume_skb(segs);
 free_gso_skb:
        consume_skb(skb);
 }