p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Dave 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: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Dave Hansen 2018-05-09 10:13:40 -07:00 committed by Ingo Molnar
parent 55556b0b20
commit 86b9eea230
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/testing/selftests/x86/protection_keys.c
View File

@ -72,10 +72,9 @@ extern void abort_hooks(void);
test_nr, iteration_nr); \ test_nr, iteration_nr); \
dprintf0("errno at assert: %d", errno); \ dprintf0("errno at assert: %d", errno); \
abort_hooks(); \ abort_hooks(); \
assert(condition); \ exit(__LINE__); \
} \ } \
} while (0) } while (0)
#define raw_assert(cond) assert(cond)
void cat_into_file(char *str, char *file) 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 * these need to be raw because they are called under
* pkey_assert() * 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)); ret = write(fd, str, strlen(str));
if (ret != strlen(str)) { if (ret != strlen(str)) {
perror("write to file failed"); perror("write to file failed");
fprintf(stderr, "filename: '%s' str: '%s'\n", file, str); fprintf(stderr, "filename: '%s' str: '%s'\n", file, str);
raw_assert(0); exit(__LINE__);
} }
close(fd); close(fd);
} }