2022-07-06 10:07:44

by David Gow

Subject: [PATCH v3] apparmor: test: Remove some casts which are no-longer required

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 <[email protected]>
Acked-by: John Johansen <[email protected]>
Signed-off-by: David Gow <[email protected]>
---

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

[1]: https://lore.kernel.org/linux-kselftest/[email protected]/
[2]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5f91bd9f1e7ad5a2025a2f95a2bc002cb7c9e0f9
[3]: https://lore.kernel.org/all/[email protected]/
---
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);
}
--
2.37.0.rc0.161.g10f37bed90-goog

2022-07-20 20:34:22

by John Johansen

Subject: Re: [PATCH v3] apparmor: test: Remove some casts which are no-longer required

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 <[email protected]>
> Acked-by: John Johansen <[email protected]>
> Signed-off-by: David Gow <[email protected]>

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
>
> [1]: https://lore.kernel.org/linux-kselftest/[email protected]/
> [2]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5f91bd9f1e7ad5a2025a2f95a2bc002cb7c9e0f9
> [3]: https://lore.kernel.org/all/[email protected]/
> ---
> 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);
> }