Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86b9eea2 authored by Dave Hansen's avatar Dave Hansen Committed by Ingo Molnar
Browse files

x86/pkeys/selftests: Stop using assert() 



If we use assert(), the program "crashes".  That can be scary to users,
so stop doing it.  Just exit with a >0 exit code instead.

Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michael Ellermen <mpe@ellerman.id.au>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ram Pai <linuxram@us.ibm.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20180509171340.E63EF7DA@viggo.jf.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 55556b0b

tools/testing/selftests/x86/protection_keys.c

+8 −4
Original line number Diff line number Diff line
@@ -72,10 +72,9 @@ extern void abort_hooks(void); 
				test_nr, iteration_nr);	\

		dprintf0("errno at assert: %d", errno);	\

		abort_hooks();			\

		assert(condition);		\

		exit(__LINE__);			\

	}					\

} while (0)

#define raw_assert(cond) assert(cond)



void cat_into_file(char *str, char *file)

{
@@ -87,12 +86,17 @@ void cat_into_file(char *str, char *file) 
	 * these need to be raw because they are called under

	 * pkey_assert()

	 */

	raw_assert(fd >= 0);

	if (fd < 0) {

		fprintf(stderr, "error opening '%s'\n", str);

		perror("error: ");

		exit(__LINE__);

	}



	ret = write(fd, str, strlen(str));

	if (ret != strlen(str)) {

		perror("write to file failed");

		fprintf(stderr, "filename: '%s' str: '%s'\n", file, str);

		raw_assert(0);

		exit(__LINE__);

	}

	close(fd);

}