Unverified Commit ffc5791c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12621 apparmor: fix policy_unpack_test on big endian systems 

Merge Pull Request from: @ci-robot 
 
PR sync from: Gu Bowen <gubowen5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LXEYJUEB2H3KI6XBBLCZE2RI5AIGYODG/ 
 
https://gitee.com/openeuler/kernel/issues/IB0D93 
 
Link:https://gitee.com/openeuler/kernel/pulls/12621

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 635900c4 74a255ec

security/apparmor/policy_unpack_test.c

+3 −3
Original line number Diff line number Diff line
@@ -78,14 +78,14 @@ struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, 
	*(buf + 1) = strlen(TEST_U32_NAME) + 1;

	strcpy(buf + 3, TEST_U32_NAME);

	*(buf + 3 + strlen(TEST_U32_NAME) + 1) = AA_U32;

	*((u32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = TEST_U32_DATA;

	*((__le32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = cpu_to_le32(TEST_U32_DATA);



	buf = e->start + TEST_NAMED_U64_BUF_OFFSET;

	*buf = AA_NAME;

	*(buf + 1) = strlen(TEST_U64_NAME) + 1;

	strcpy(buf + 3, TEST_U64_NAME);

	*(buf + 3 + strlen(TEST_U64_NAME) + 1) = AA_U64;

	*((u64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = TEST_U64_DATA;

	*((__le64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = cpu_to_le64(TEST_U64_DATA);



	buf = e->start + TEST_NAMED_BLOB_BUF_OFFSET;

	*buf = AA_NAME;
@@ -101,7 +101,7 @@ struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, 
	*(buf + 1) = strlen(TEST_ARRAY_NAME) + 1;

	strcpy(buf + 3, TEST_ARRAY_NAME);

	*(buf + 3 + strlen(TEST_ARRAY_NAME) + 1) = AA_ARRAY;

	*((u16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = TEST_ARRAY_SIZE;

	*((__le16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = cpu_to_le16(TEST_ARRAY_SIZE);



	return e;

}