Skip to content

Commit 98c0cc4

Browse files
committed
apparmor: fix policy_unpack_test on big endian systems
policy_unpack_test fails on big endian systems because data byte order is expected to be little endian but is generated in host byte order. This results in test failures such as: # policy_unpack_test_unpack_array_with_null_name: EXPECTATION FAILED at security/apparmor/policy_unpack_test.c:150 Expected array_size == (u16)16, but array_size == 4096 (0x1000) (u16)16 == 16 (0x10) # policy_unpack_test_unpack_array_with_null_name: pass:0 fail:1 skip:0 total:1 not ok 3 policy_unpack_test_unpack_array_with_null_name # policy_unpack_test_unpack_array_with_name: EXPECTATION FAILED at security/apparmor/policy_unpack_test.c:164 Expected array_size == (u16)16, but array_size == 4096 (0x1000) (u16)16 == 16 (0x10) # policy_unpack_test_unpack_array_with_name: pass:0 fail:1 skip:0 total:1 Add the missing endianness conversions when generating test data. Fixes: 4d944bc ("apparmor: add AppArmor KUnit tests for policy unpack") Cc: Brendan Higgins <brendanhiggins@google.com> Cc: Kees Cook <keescook@chromium.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent 5a4c785 commit 98c0cc4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

security/apparmor/policy_unpack_test.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf,
8080
*(buf + 1) = strlen(TEST_U32_NAME) + 1;
8181
strscpy(buf + 3, TEST_U32_NAME, e->end - (void *)(buf + 3));
8282
*(buf + 3 + strlen(TEST_U32_NAME) + 1) = AA_U32;
83-
*((u32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = TEST_U32_DATA;
83+
*((__le32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = cpu_to_le32(TEST_U32_DATA);
8484

8585
buf = e->start + TEST_NAMED_U64_BUF_OFFSET;
8686
*buf = AA_NAME;
8787
*(buf + 1) = strlen(TEST_U64_NAME) + 1;
8888
strscpy(buf + 3, TEST_U64_NAME, e->end - (void *)(buf + 3));
8989
*(buf + 3 + strlen(TEST_U64_NAME) + 1) = AA_U64;
90-
*((u64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = TEST_U64_DATA;
90+
*((__le64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = cpu_to_le64(TEST_U64_DATA);
9191

9292
buf = e->start + TEST_NAMED_BLOB_BUF_OFFSET;
9393
*buf = AA_NAME;
@@ -103,7 +103,7 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf,
103103
*(buf + 1) = strlen(TEST_ARRAY_NAME) + 1;
104104
strscpy(buf + 3, TEST_ARRAY_NAME, e->end - (void *)(buf + 3));
105105
*(buf + 3 + strlen(TEST_ARRAY_NAME) + 1) = AA_ARRAY;
106-
*((u16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = TEST_ARRAY_SIZE;
106+
*((__le16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = cpu_to_le16(TEST_ARRAY_SIZE);
107107

108108
return e;
109109
}

0 commit comments

Comments
 (0)