Merge tag 'apparmor-pr-2022-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / security / apparmor / policy_unpack_test.c

diff --git a/security/apparmor/policy_unpack_test.c b/security/apparmor/policy_unpack_test.c
index f25cf2a023d571a92344c7a2e36df2aec54315e7..e1bfdab524b7993576c625f49cb5de49a5121439 100644 (file)
--- a/security/apparmor/policy_unpack_test.c
+++ b/security/apparmor/policy_unpack_test.c
@@ -143,12 +143,11 @@ static void policy_unpack_test_inbounds_when_out_of_bounds(struct kunit *test)
 static void policy_unpack_test_unpack_array_with_null_name(struct kunit *test)
 {
        struct policy_unpack_fixture *puf = test->priv;
-       u16 array_size;
+       u16 array_size = 0;
 
        puf->e->pos += TEST_ARRAY_BUF_OFFSET;
 
-       array_size = aa_unpack_array(puf->e, NULL);
-
+       KUNIT_EXPECT_TRUE(test, aa_unpack_array(puf->e, NULL, &array_size));
        KUNIT_EXPECT_EQ(test, array_size, (u16)TEST_ARRAY_SIZE);
        KUNIT_EXPECT_PTR_EQ(test, puf->e->pos,
                puf->e->start + TEST_ARRAY_BUF_OFFSET + sizeof(u16) + 1);
@@ -158,12 +157,11 @@ static void policy_unpack_test_unpack_array_with_name(struct kunit *test)
 {
        struct policy_unpack_fixture *puf = test->priv;
        const char name[] = TEST_ARRAY_NAME;
-       u16 array_size;
+       u16 array_size = 0;
 
        puf->e->pos += TEST_NAMED_ARRAY_BUF_OFFSET;
 
-       array_size = aa_unpack_array(puf->e, name);
-
+       KUNIT_EXPECT_TRUE(test, aa_unpack_array(puf->e, name, &array_size));
        KUNIT_EXPECT_EQ(test, array_size, (u16)TEST_ARRAY_SIZE);
        KUNIT_EXPECT_PTR_EQ(test, puf->e->pos,
                puf->e->start + TEST_ARRAY_BUF_OFFSET + sizeof(u16) + 1);
@@ -178,9 +176,7 @@ static void policy_unpack_test_unpack_array_out_of_bounds(struct kunit *test)
        puf->e->pos += TEST_NAMED_ARRAY_BUF_OFFSET;
        puf->e->end = puf->e->start + TEST_ARRAY_BUF_OFFSET + sizeof(u16);
 
-       array_size = aa_unpack_array(puf->e, name);
-
-       KUNIT_EXPECT_EQ(test, array_size, 0);
+       KUNIT_EXPECT_FALSE(test, aa_unpack_array(puf->e, name, &array_size));
        KUNIT_EXPECT_PTR_EQ(test, puf->e->pos,
                puf->e->start + TEST_NAMED_ARRAY_BUF_OFFSET);
 }