On 7/6/22 03:06, David Gow wrote:

With some of the stricter type checking in KUnit's EXPECT macros removed, several casts in policy_unpack_test are no longer required.

Remove the unnecessary casts, making the conditions clearer.

Reviewed-by: Brendan Higgins brendanhiggins@google.com Acked-by: John Johansen john.johansen@canonical.com Signed-off-by: David Gow davidgow@google.com

I have pulled this into apparmor-next

---

This is a rebase and resend of [1], which had been accepted into the AppArmor tree, but eventually conflicted with [2]. Let's push it via the KUnit tree to avoid any further conflicts, as discussed in [3].

Cheers, -- David

[3]: https://lore.kernel.org/all/20220405125540.2135d81d@canb.auug.org.au/

security/apparmor/policy_unpack_test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/security/apparmor/policy_unpack_test.c b/security/apparmor/policy_unpack_test.c index 5c18d2f19862..7954cb23d5f2 100644 --- a/security/apparmor/policy_unpack_test.c +++ b/security/apparmor/policy_unpack_test.c @@ -177,7 +177,7 @@ static void policy_unpack_test_unpack_array_out_of_bounds(struct kunit *test) array_size = unpack_array(puf->e, name);

• KUNIT_EXPECT_EQ(test, array_size, (u16)0);

• KUNIT_EXPECT_EQ(test, array_size, 0); KUNIT_EXPECT_PTR_EQ(test, puf->e->pos, puf->e->start + TEST_NAMED_ARRAY_BUF_OFFSET); }

@@ -391,10 +391,10 @@ static void policy_unpack_test_unpack_u16_chunk_basic(struct kunit *test) size = unpack_u16_chunk(puf->e, &chunk);

• KUNIT_EXPECT_PTR_EQ(test, (void *)chunk,

• KUNIT_EXPECT_PTR_EQ(test, chunk, puf->e->start + TEST_U16_OFFSET + 2);

• KUNIT_EXPECT_EQ(test, size, (size_t)TEST_U16_DATA);
• KUNIT_EXPECT_PTR_EQ(test, puf->e->pos, (void *)(chunk + TEST_U16_DATA));

• KUNIT_EXPECT_EQ(test, size, TEST_U16_DATA);
• KUNIT_EXPECT_PTR_EQ(test, puf->e->pos, (chunk + TEST_U16_DATA)); }

static void policy_unpack_test_unpack_u16_chunk_out_of_bounds_1( @@ -408,7 +408,7 @@ static void policy_unpack_test_unpack_u16_chunk_out_of_bounds_1( size = unpack_u16_chunk(puf->e, &chunk);

• KUNIT_EXPECT_EQ(test, size, (size_t)0);

• KUNIT_EXPECT_EQ(test, size, 0); KUNIT_EXPECT_NULL(test, chunk); KUNIT_EXPECT_PTR_EQ(test, puf->e->pos, puf->e->end - 1); }

@@ -430,7 +430,7 @@ static void policy_unpack_test_unpack_u16_chunk_out_of_bounds_2( size = unpack_u16_chunk(puf->e, &chunk);

• KUNIT_EXPECT_EQ(test, size, (size_t)0);

• KUNIT_EXPECT_EQ(test, size, 0); KUNIT_EXPECT_NULL(test, chunk); KUNIT_EXPECT_PTR_EQ(test, puf->e->pos, puf->e->start + TEST_U16_OFFSET); }