Commit 32490541 authored Oct 03, 2022 by John Johansen

apparmor: Fix kunit test for out of bounds array



The apparmor kunit tests are failing on the out of bounds array check
with the following failure

  # policy_unpack_test_unpack_array_out_of_bounds: EXPECTATION FAILED at security/apparmor/policy_unpack_test.c:178
  Expected unpack_array(puf->e, name, &array_size) == 1, but
  unpack_array(puf->e, name, &array_size) == -1
  # policy_unpack_test_unpack_array_out_of_bounds: EXPECTATION FAILED at security/apparmor/policy_unpack_test.c:180
  Expected array_size == 0, but
  array_size == 64192
  not ok 5 - policy_unpack_test_unpack_array_out_of_bounds

This is because unpack_array changed to allow distinguishing between
the array not being present and an error. In the error case the array
size is not set and should not be tested.

Reported-by: kernel test robot <yujie.liu@intel.com>
Fixes: 995a5b64620e ("apparmor: make unpack_array return a trianary value")
Signed-off-by: John Johansen <john.johansen@canonical.com>

parent a2f31df0

security/apparmor/policy_unpack_test.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -176,8 +176,7 @@ static void policy_unpack_test_unpack_array_out_of_bounds(struct kunit *test)
		puf->e->end = puf->e->start + TEST_ARRAY_BUF_OFFSET + sizeof(u16);

		KUNIT_EXPECT_EQ(test, unpack_array(puf->e, name, &array_size),
		TRI_TRUE);
		KUNIT_EXPECT_EQ(test, array_size, 0);
		TRI_FALSE);
		KUNIT_EXPECT_PTR_EQ(test, puf->e->pos,
		puf->e->start + TEST_NAMED_ARRAY_BUF_OFFSET);
		}