diff options
| author | Will Deacon <will@kernel.org> | 2024-05-09 17:56:18 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-05-09 17:56:18 +0300 |
| commit | 46e336c72b6354017a50754577f3f5ea82e22319 (patch) | |
| tree | 615ee4488cde6824a51b31af92c0385ff0341991 | |
| parent | 42e7ddbaf1909835a81e8e746cf6420bdd63d237 (diff) | |
| parent | 80164282b3620a3cb73de6ffda5592743e448d0e (diff) | |
| download | linux-46e336c72b6354017a50754577f3f5ea82e22319.tar.xz | |
Merge branch 'for-next/selftests' into for-next/core
* for-next/selftests:
kselftest: arm64: Add a null pointer check
kselftest/arm64: Remove unused parameters in abi test
| -rw-r--r-- | tools/testing/selftests/arm64/abi/tpidr2.c | 2 | ||||
| -rw-r--r-- | tools/testing/selftests/arm64/tags/tags_test.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/testing/selftests/arm64/abi/tpidr2.c b/tools/testing/selftests/arm64/abi/tpidr2.c index 02ee3a91b780..285c47dd42f6 100644 --- a/tools/testing/selftests/arm64/abi/tpidr2.c +++ b/tools/testing/selftests/arm64/abi/tpidr2.c @@ -262,7 +262,7 @@ static int write_clone_read(void) int main(int argc, char **argv) { - int ret, i; + int ret; putstr("TAP version 13\n"); putstr("1.."); diff --git a/tools/testing/selftests/arm64/tags/tags_test.c b/tools/testing/selftests/arm64/tags/tags_test.c index 5701163460ef..955f87c1170d 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); |