mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-10-23 07:23:12 +02:00
apparmor: Fix unaligned memory accesses in KUnit test
The testcase triggers some unnecessary unaligned memory accesses on the
parisc architecture:
Kernel: unaligned access to 0x12f28e27 in policy_unpack_test_init+0x180/0x374 (iir 0x0cdc1280)
Kernel: unaligned access to 0x12f28e67 in policy_unpack_test_init+0x270/0x374 (iir 0x64dc00ce)
Use the existing helper functions put_unaligned_le32() and
put_unaligned_le16() to avoid such warnings on architectures which
prefer aligned memory accesses.
Signed-off-by: Helge Deller <deller@gmx.de>
Fixes: 98c0cc48e2
("apparmor: fix policy_unpack_test on big endian systems")
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
parent
c567de2c4f
commit
c68804199d
|
@ -9,6 +9,8 @@
|
|||
#include "include/policy.h"
|
||||
#include "include/policy_unpack.h"
|
||||
|
||||
#include <linux/unaligned.h>
|
||||
|
||||
#define TEST_STRING_NAME "TEST_STRING"
|
||||
#define TEST_STRING_DATA "testing"
|
||||
#define TEST_STRING_BUF_OFFSET \
|
||||
|
@ -80,7 +82,7 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf,
|
|||
*(buf + 1) = strlen(TEST_U32_NAME) + 1;
|
||||
strscpy(buf + 3, TEST_U32_NAME, e->end - (void *)(buf + 3));
|
||||
*(buf + 3 + strlen(TEST_U32_NAME) + 1) = AA_U32;
|
||||
*((__le32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = cpu_to_le32(TEST_U32_DATA);
|
||||
put_unaligned_le32(TEST_U32_DATA, buf + 3 + strlen(TEST_U32_NAME) + 2);
|
||||
|
||||
buf = e->start + TEST_NAMED_U64_BUF_OFFSET;
|
||||
*buf = AA_NAME;
|
||||
|
@ -103,7 +105,7 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf,
|
|||
*(buf + 1) = strlen(TEST_ARRAY_NAME) + 1;
|
||||
strscpy(buf + 3, TEST_ARRAY_NAME, e->end - (void *)(buf + 3));
|
||||
*(buf + 3 + strlen(TEST_ARRAY_NAME) + 1) = AA_ARRAY;
|
||||
*((__le16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = cpu_to_le16(TEST_ARRAY_SIZE);
|
||||
put_unaligned_le16(TEST_ARRAY_SIZE, buf + 3 + strlen(TEST_ARRAY_NAME) + 2);
|
||||
|
||||
return e;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user