| From 444020b211777ef04b0c02d7e770f3994fd757b0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 23 Apr 2024 16:21:02 +0800 |
| Subject: kselftest: arm64: Add a null pointer check |
| |
| From: Kunwu Chan <chentao@kylinos.cn> |
| |
| [ Upstream commit 80164282b3620a3cb73de6ffda5592743e448d0e ] |
| |
| There is a 'malloc' call, which can be unsuccessful. |
| This patch will add the malloc failure checking |
| to avoid possible null dereference and give more information |
| about test fail reasons. |
| |
| Signed-off-by: Kunwu Chan <chentao@kylinos.cn> |
| Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com> |
| Link: https://lore.kernel.org/r/20240423082102.2018886-1-chentao@kylinos.cn |
| Signed-off-by: Will Deacon <will@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/testing/selftests/arm64/tags/tags_test.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| diff --git a/tools/testing/selftests/arm64/tags/tags_test.c b/tools/testing/selftests/arm64/tags/tags_test.c |
| index 5701163460ef7..955f87c1170d7 100644 |
| --- a/tools/testing/selftests/arm64/tags/tags_test.c |
| +++ b/tools/testing/selftests/arm64/tags/tags_test.c |
| @@ -6,6 +6,7 @@ |
| #include <stdint.h> |
| #include <sys/prctl.h> |
| #include <sys/utsname.h> |
| +#include "../../kselftest.h" |
| |
| #define SHIFT_TAG(tag) ((uint64_t)(tag) << 56) |
| #define SET_TAG(ptr, tag) (((uint64_t)(ptr) & ~SHIFT_TAG(0xff)) | \ |
| @@ -21,6 +22,9 @@ int main(void) |
| if (prctl(PR_SET_TAGGED_ADDR_CTRL, PR_TAGGED_ADDR_ENABLE, 0, 0, 0) == 0) |
| tbi_enabled = 1; |
| ptr = (struct utsname *)malloc(sizeof(*ptr)); |
| + if (!ptr) |
| + ksft_exit_fail_msg("Failed to allocate utsname buffer\n"); |
| + |
| if (tbi_enabled) |
| tag = 0x42; |
| ptr = (struct utsname *)SET_TAG(ptr, tag); |
| -- |
| 2.43.0 |
| |