@@ -411,7 +411,8 @@ static void test_update_ca(void)
411411 return ;
412412
413413 link = bpf_map__attach_struct_ops (skel -> maps .ca_update_1 );
414- ASSERT_OK_PTR (link , "attach_struct_ops" );
414+ if (!ASSERT_OK_PTR (link , "attach_struct_ops" ))
415+ goto err ;
415416
416417 do_test (& opts );
417418 saved_ca1_cnt = skel -> bss -> ca1_cnt ;
@@ -425,6 +426,7 @@ static void test_update_ca(void)
425426 ASSERT_GT (skel -> bss -> ca2_cnt , 0 , "ca2_ca2_cnt" );
426427
427428 bpf_link__destroy (link );
429+ err :
428430 tcp_ca_update__destroy (skel );
429431}
430432
@@ -447,7 +449,8 @@ static void test_update_wrong(void)
447449 return ;
448450
449451 link = bpf_map__attach_struct_ops (skel -> maps .ca_update_1 );
450- ASSERT_OK_PTR (link , "attach_struct_ops" );
452+ if (!ASSERT_OK_PTR (link , "attach_struct_ops" ))
453+ goto err ;
451454
452455 do_test (& opts );
453456 saved_ca1_cnt = skel -> bss -> ca1_cnt ;
@@ -460,6 +463,7 @@ static void test_update_wrong(void)
460463 ASSERT_GT (skel -> bss -> ca1_cnt , saved_ca1_cnt , "ca2_ca1_cnt" );
461464
462465 bpf_link__destroy (link );
466+ err :
463467 tcp_ca_update__destroy (skel );
464468}
465469
@@ -484,7 +488,8 @@ static void test_mixed_links(void)
484488 ASSERT_OK_PTR (link_nl , "attach_struct_ops_nl" );
485489
486490 link = bpf_map__attach_struct_ops (skel -> maps .ca_update_1 );
487- ASSERT_OK_PTR (link , "attach_struct_ops" );
491+ if (!ASSERT_OK_PTR (link , "attach_struct_ops" ))
492+ goto err ;
488493
489494 do_test (& opts );
490495 ASSERT_GT (skel -> bss -> ca1_cnt , 0 , "ca1_ca1_cnt" );
@@ -493,6 +498,7 @@ static void test_mixed_links(void)
493498 ASSERT_ERR (err , "update_map" );
494499
495500 bpf_link__destroy (link );
501+ err :
496502 bpf_link__destroy (link_nl );
497503 tcp_ca_update__destroy (skel );
498504}
@@ -536,7 +542,8 @@ static void test_link_replace(void)
536542 bpf_link__destroy (link );
537543
538544 link = bpf_map__attach_struct_ops (skel -> maps .ca_update_2 );
539- ASSERT_OK_PTR (link , "attach_struct_ops_2nd" );
545+ if (!ASSERT_OK_PTR (link , "attach_struct_ops_2nd" ))
546+ goto err ;
540547
541548 /* BPF_F_REPLACE with a wrong old map Fd. It should fail!
542549 *
@@ -559,6 +566,7 @@ static void test_link_replace(void)
559566
560567 bpf_link__destroy (link );
561568
569+ err :
562570 tcp_ca_update__destroy (skel );
563571}
564572
0 commit comments