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

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

tools/testing/selftests/arm64/abi/tpidr2.c

+1 −1
Original line number Diff line number Diff line
@@ -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..");

tools/testing/selftests/arm64/tags/tags_test.c

+4 −0
Original line number Diff line number Diff line
@@ -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);