Skip to content

Commit 34f866d

Browse files
Jinjie Ruanpull[bot]
Jinjie Ruan
authored and
pull[bot]
committed
net: microchip: sparx5: Fix memory leak for vcap_api_rule_add_keyvalue_test()
Inject fault while probing kunit-example-test.ko, the field which is allocated by kzalloc in vcap_rule_add_key() of vcap_rule_add_key_bit/u32/u128() is not freed, and it cause the memory leaks below. unreferenced object 0xffff0276c14b7240 (size 64): comm "kunit_try_catch", pid 284, jiffies 4294894220 (age 920.072s) hex dump (first 32 bytes): 28 3c 61 82 00 80 ff ff 28 3c 61 82 00 80 ff ff (<a.....(<a..... 67 00 00 00 00 00 00 00 00 01 37 2b af ab ff ff g.........7+.... backtrace: [<0000000028f08898>] slab_post_alloc_hook+0xb8/0x368 [<00000000514b9b37>] __kmem_cache_alloc_node+0x174/0x290 [<000000004620684a>] kmalloc_trace+0x40/0x164 [<0000000059ad6bcd>] vcap_rule_add_key+0x104/0x180 [<00000000ff8002d3>] vcap_api_rule_add_keyvalue_test+0x100/0xba8 [<00000000fcc5326c>] kunit_try_run_case+0x50/0xac [<00000000f5f45b20>] kunit_generic_run_threadfn_adapter+0x20/0x2c [<0000000026284079>] kthread+0x124/0x130 [<0000000024d4a996>] ret_from_fork+0x10/0x20 unreferenced object 0xffff0276c14b7280 (size 64): comm "kunit_try_catch", pid 284, jiffies 4294894221 (age 920.068s) hex dump (first 32 bytes): 28 3c 61 82 00 80 ff ff 28 3c 61 82 00 80 ff ff (<a.....(<a..... 67 00 00 00 00 00 00 00 01 01 37 2b af ab ff ff g.........7+.... backtrace: [<0000000028f08898>] slab_post_alloc_hook+0xb8/0x368 [<00000000514b9b37>] __kmem_cache_alloc_node+0x174/0x290 [<000000004620684a>] kmalloc_trace+0x40/0x164 [<0000000059ad6bcd>] vcap_rule_add_key+0x104/0x180 [<00000000f5ac9dc7>] vcap_api_rule_add_keyvalue_test+0x168/0xba8 [<00000000fcc5326c>] kunit_try_run_case+0x50/0xac [<00000000f5f45b20>] kunit_generic_run_threadfn_adapter+0x20/0x2c [<0000000026284079>] kthread+0x124/0x130 [<0000000024d4a996>] ret_from_fork+0x10/0x20 unreferenced object 0xffff0276c14b72c0 (size 64): comm "kunit_try_catch", pid 284, jiffies 4294894221 (age 920.068s) hex dump (first 32 bytes): 28 3c 61 82 00 80 ff ff 28 3c 61 82 00 80 ff ff (<a.....(<a..... 67 00 00 00 00 00 00 00 00 00 37 2b af ab ff ff g.........7+.... backtrace: [<0000000028f08898>] slab_post_alloc_hook+0xb8/0x368 [<00000000514b9b37>] __kmem_cache_alloc_node+0x174/0x290 [<000000004620684a>] kmalloc_trace+0x40/0x164 [<0000000059ad6bcd>] vcap_rule_add_key+0x104/0x180 [<00000000c918ae7f>] vcap_api_rule_add_keyvalue_test+0x1d0/0xba8 [<00000000fcc5326c>] kunit_try_run_case+0x50/0xac [<00000000f5f45b20>] kunit_generic_run_threadfn_adapter+0x20/0x2c [<0000000026284079>] kthread+0x124/0x130 [<0000000024d4a996>] ret_from_fork+0x10/0x20 unreferenced object 0xffff0276c14b7300 (size 64): comm "kunit_try_catch", pid 284, jiffies 4294894221 (age 920.084s) hex dump (first 32 bytes): 28 3c 61 82 00 80 ff ff 28 3c 61 82 00 80 ff ff (<a.....(<a..... 7d 00 00 00 01 00 00 00 32 54 76 98 ab ff 00 ff }.......2Tv..... backtrace: [<0000000028f08898>] slab_post_alloc_hook+0xb8/0x368 [<00000000514b9b37>] __kmem_cache_alloc_node+0x174/0x290 [<000000004620684a>] kmalloc_trace+0x40/0x164 [<0000000059ad6bcd>] vcap_rule_add_key+0x104/0x180 [<0000000003352814>] vcap_api_rule_add_keyvalue_test+0x240/0xba8 [<00000000fcc5326c>] kunit_try_run_case+0x50/0xac [<00000000f5f45b20>] kunit_generic_run_threadfn_adapter+0x20/0x2c [<0000000026284079>] kthread+0x124/0x130 [<0000000024d4a996>] ret_from_fork+0x10/0x20 unreferenced object 0xffff0276c14b7340 (size 64): comm "kunit_try_catch", pid 284, jiffies 4294894221 (age 920.084s) hex dump (first 32 bytes): 28 3c 61 82 00 80 ff ff 28 3c 61 82 00 80 ff ff (<a.....(<a..... 51 00 00 00 07 00 00 00 17 26 35 44 63 62 71 00 Q........&5Dcbq. backtrace: [<0000000028f08898>] slab_post_alloc_hook+0xb8/0x368 [<00000000514b9b37>] __kmem_cache_alloc_node+0x174/0x290 [<000000004620684a>] kmalloc_trace+0x40/0x164 [<0000000059ad6bcd>] vcap_rule_add_key+0x104/0x180 [<000000001516f109>] vcap_api_rule_add_keyvalue_test+0x2cc/0xba8 [<00000000fcc5326c>] kunit_try_run_case+0x50/0xac [<00000000f5f45b20>] kunit_generic_run_threadfn_adapter+0x20/0x2c [<0000000026284079>] kthread+0x124/0x130 [<0000000024d4a996>] ret_from_fork+0x10/0x20 Fixes: c956b9b ("net: microchip: sparx5: Adding KUNIT tests of key/action values in VCAP API") Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 086427d commit 34f866d

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

‎drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -995,6 +995,16 @@ static void vcap_api_encode_rule_actionset_test(struct kunit *test)
995995
KUNIT_EXPECT_EQ(test, (u32)0x00000000, actwords[11]);
996996
}
997997

998+
static void vcap_free_ckf(struct vcap_rule *rule)
999+
{
1000+
struct vcap_client_keyfield *ckf, *next_ckf;
1001+
1002+
list_for_each_entry_safe(ckf, next_ckf, &rule->keyfields, ctrl.list) {
1003+
list_del(&ckf->ctrl.list);
1004+
kfree(ckf);
1005+
}
1006+
}
1007+
9981008
static void vcap_api_rule_add_keyvalue_test(struct kunit *test)
9991009
{
10001010
struct vcap_admin admin = {
@@ -1027,6 +1037,7 @@ static void vcap_api_rule_add_keyvalue_test(struct kunit *test)
10271037
KUNIT_EXPECT_EQ(test, VCAP_FIELD_BIT, kf->ctrl.type);
10281038
KUNIT_EXPECT_EQ(test, 0x0, kf->data.u1.value);
10291039
KUNIT_EXPECT_EQ(test, 0x1, kf->data.u1.mask);
1040+
vcap_free_ckf(rule);
10301041

10311042
INIT_LIST_HEAD(&rule->keyfields);
10321043
ret = vcap_rule_add_key_bit(rule, VCAP_KF_LOOKUP_FIRST_IS, VCAP_BIT_1);
@@ -1039,6 +1050,7 @@ static void vcap_api_rule_add_keyvalue_test(struct kunit *test)
10391050
KUNIT_EXPECT_EQ(test, VCAP_FIELD_BIT, kf->ctrl.type);
10401051
KUNIT_EXPECT_EQ(test, 0x1, kf->data.u1.value);
10411052
KUNIT_EXPECT_EQ(test, 0x1, kf->data.u1.mask);
1053+
vcap_free_ckf(rule);
10421054

10431055
INIT_LIST_HEAD(&rule->keyfields);
10441056
ret = vcap_rule_add_key_bit(rule, VCAP_KF_LOOKUP_FIRST_IS,
@@ -1052,6 +1064,7 @@ static void vcap_api_rule_add_keyvalue_test(struct kunit *test)
10521064
KUNIT_EXPECT_EQ(test, VCAP_FIELD_BIT, kf->ctrl.type);
10531065
KUNIT_EXPECT_EQ(test, 0x0, kf->data.u1.value);
10541066
KUNIT_EXPECT_EQ(test, 0x0, kf->data.u1.mask);
1067+
vcap_free_ckf(rule);
10551068

10561069
INIT_LIST_HEAD(&rule->keyfields);
10571070
ret = vcap_rule_add_key_u32(rule, VCAP_KF_TYPE, 0x98765432, 0xff00ffab);
@@ -1064,6 +1077,7 @@ static void vcap_api_rule_add_keyvalue_test(struct kunit *test)
10641077
KUNIT_EXPECT_EQ(test, VCAP_FIELD_U32, kf->ctrl.type);
10651078
KUNIT_EXPECT_EQ(test, 0x98765432, kf->data.u32.value);
10661079
KUNIT_EXPECT_EQ(test, 0xff00ffab, kf->data.u32.mask);
1080+
vcap_free_ckf(rule);
10671081

10681082
INIT_LIST_HEAD(&rule->keyfields);
10691083
ret = vcap_rule_add_key_u128(rule, VCAP_KF_L3_IP6_SIP, &dip);
@@ -1078,6 +1092,7 @@ static void vcap_api_rule_add_keyvalue_test(struct kunit *test)
10781092
KUNIT_EXPECT_EQ(test, dip.value[idx], kf->data.u128.value[idx]);
10791093
for (idx = 0; idx < ARRAY_SIZE(dip.mask); ++idx)
10801094
KUNIT_EXPECT_EQ(test, dip.mask[idx], kf->data.u128.mask[idx]);
1095+
vcap_free_ckf(rule);
10811096
}
10821097

10831098
static void vcap_api_rule_add_actionvalue_test(struct kunit *test)

0 commit comments

Comments
 (0)