Commit 46e336c7 authored by Will Deacon's avatar Will Deacon

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
parents 42e7ddba 80164282
...@@ -262,7 +262,7 @@ static int write_clone_read(void) ...@@ -262,7 +262,7 @@ static int write_clone_read(void)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int ret, i; int ret;
putstr("TAP version 13\n"); putstr("TAP version 13\n");
putstr("1.."); putstr("1..");
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <stdint.h> #include <stdint.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include "../../kselftest.h"
#define SHIFT_TAG(tag) ((uint64_t)(tag) << 56) #define SHIFT_TAG(tag) ((uint64_t)(tag) << 56)
#define SET_TAG(ptr, tag) (((uint64_t)(ptr) & ~SHIFT_TAG(0xff)) | \ #define SET_TAG(ptr, tag) (((uint64_t)(ptr) & ~SHIFT_TAG(0xff)) | \
...@@ -21,6 +22,9 @@ int main(void) ...@@ -21,6 +22,9 @@ int main(void)
if (prctl(PR_SET_TAGGED_ADDR_CTRL, PR_TAGGED_ADDR_ENABLE, 0, 0, 0) == 0) if (prctl(PR_SET_TAGGED_ADDR_CTRL, PR_TAGGED_ADDR_ENABLE, 0, 0, 0) == 0)
tbi_enabled = 1; tbi_enabled = 1;
ptr = (struct utsname *)malloc(sizeof(*ptr)); ptr = (struct utsname *)malloc(sizeof(*ptr));
if (!ptr)
ksft_exit_fail_msg("Failed to allocate utsname buffer\n");
if (tbi_enabled) if (tbi_enabled)
tag = 0x42; tag = 0x42;
ptr = (struct utsname *)SET_TAG(ptr, tag); ptr = (struct utsname *)SET_TAG(ptr, tag);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment