syscalls/statx05: Fix failures on s390 & old libc
PATCH 1/1 syscalls/statx05: Fix failures on s390 & old libc
When encryption is not enabled in the kernel e4crypt fails with non-zero exit value. The value is then stored to long via the TEST() macro. The problem is that WEXITSTATUS() does not work with long on big endian s390 on older libc[1][2]. And while this is not our bug, it also does not make sense to misuse the TEST() macro for catching return value from tst_test().
[1] https://sourceware.org/bugzilla/show_bug.cgi?id=19613
[2] https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b49ab5f4503f36dcbf43f821f817da66b2931fe6
--- testcases/kernel/syscalls/statx/statx05.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
testcases/kernel/syscalls/statx/statx05.c +4 -3
@@ -88,6 +88,7 @@ static void setup(void) {char opt_bsize[32 ];const char *const extra_opts[] = {"-O encrypt" , opt_bsize,NULL }; +int ret;snprintf (opt_bsize,sizeof (opt_bsize),"-b %i" ,getpagesize ());
@@ -98,12 +99,12 @@ static void setup(void)SAFE_MKDIR (TESTDIR_FLAGGED ,0777 );SAFE_MKDIR (TESTDIR_UNFLAGGED ,0777 ); -TEST (tst_system ("echo qwery | e4crypt add_key " TESTDIR_FLAGGED )); + ret =tst_system ("echo qwery | e4crypt add_key " TESTDIR_FLAGGED ); -if (WEXITSTATUS (TST_RET ) ==127 ) +if (WEXITSTATUS (ret) ==127 )tst_brk (TCONF ,"e4crypt not installed!" ); -if (WEXITSTATUS (TST_RET )) +if (WEXITSTATUS (ret))tst_brk (TCONF ,"e4crypt failed (CONFIG_EXT4_ENCRYPTION not set?)" ); }
Signature · 1 line
2.23.0
PATCH 1/1 syscalls/statx05: Fix failures on s390 & old libc
----- Original Message -----
Quoted 7 lines
When encryption is not enabled in the kernel e4crypt fails with non-zero exit value. The value is then stored to long via the
TEST()macro. The problem is thatWEXITSTATUS()does not work with long on big endian s390 on older libc[1][2]. And while this is not our bug, it also does not make sense to misuse theTEST()macro for catching return value fromtst_test().
Quoted 5 lines
[1] https://sourceware.org/bugzilla/show_bug.cgi?id=19613
[2]
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b49ab5f4503f36dcbf43f821f817da66b2931fe6Signed-off-by Cyril Hrubis <[email protected]>
LGTM.
PATCH 1/1 syscalls/statx05: Fix failures on s390 & old libc
Hi!
Quoted 5 lines
Quoted 1 line
Signed-off-by Cyril Hrubis <[email protected]>LGTM.
Acked-by Jan Stancek <[email protected]>
Pushed, thanks.
Signature · 2 lines
Cyril Hrubis [email protected]