sysctl01: fix fails on live-patched kernels
PATCH v2 1/1 sysctl01: fix fails on live-patched kernels
During live-patching, the uname syscall is overridden to reflect the fact that the kernel has been live-patched. The version string obtainable through /proc/sys/kernel/version is defined during compilation and it is not touched by the live-patch. In this case, the two interfaces can report different kernel versions.
Adjust the string from uname in such cases and remove the tag added during live-patching.
--- testcases/kernel/syscalls/sysctl/sysctl01.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
kernel/syscalls/sysctl/sysctl01.c +14 -0
@@ -1,6 +1,7 @@/* * Copyright (c) International Business Machines Corp., 2001 * Copyright (c) 2018 Xiao Yang <[email protected]> +* Copyright (c) 2019 SUSE. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
@@ -77,6 +78,19 @@ static void setup(void)/* get kernel name and information */ if (uname (&buf) ==-1 )tst_brk (TBROK |TERRNO ,"uname() failed" ); + +/* revert uname change in case of kGraft/livepatch */ +char *klp_tag; +char *right_brace; + + klp_tag =strstr (buf.version,"/kGraft-" ); +if (!klp_tag) + klp_tag =strstr (buf.version,"/lp-" ); +if (klp_tag) { + right_brace =strchr (klp_tag,')' ); +if (right_brace) +memmove (klp_tag, right_brace,sizeof (char ) * (strlen (right_brace)+1 )); + } }static struct tst_test test = {
Signature · 1 line
2.21.0
PATCH v2 1/1 sysctl01: fix fails on live-patched kernels
Hi,
LGTM, with 2 minor changes (no need to repost if you agree).
Quoted 5 lines
During live-patching, the uname syscall is overridden to reflect the fact that the kernel has been live-patched. The version string obtainable through
/proc/sys/kernel/versionis defined during compilation and it is not touched by the live-patch. In this case, the two interfaces can report different kernel versions.
I'd add a comment that we're removing "/kGraft-<git_new_hash>" from "(<git_hash>/{lp,kGraft}-<git_new_hash>)"
But maybe that's known and obvious from the code.
Quoted 4 lines
Adjust the string from uname in such cases and remove the tag added during live-patching.
Signed-off-by Jan Baier <[email protected]>
...
kernel/syscalls/sysctl/sysctl01.c static void setup(void) · line 92
Quoted 7 lines
kernel/syscalls/sysctl/sysctl01.c +7
-0+ klp_tag =strstr (buf.version,"/kGraft-" ); +if (!klp_tag) + klp_tag =strstr (buf.version,"/lp-" ); +if (klp_tag) { + right_brace =strchr (klp_tag,')' ); +if (right_brace) +memmove (klp_tag, right_brace,sizeof (char ) * (strlen (right_brace)+1 ));
sizeof(char) == 1 by definition :)
...
Kind regards,
Petr
PATCH v2 1/1 sysctl01: fix fails on live-patched kernels
Hi Jan,
Quoted 9 lines
...
kernel/syscalls/sysctl/sysctl01.c static void setup(void) · line 92
Quoted 7 lines
kernel/syscalls/sysctl/sysctl01.c +7
-0+ klp_tag =strstr (buf.version,"/kGraft-" ); +if (!klp_tag) + klp_tag =strstr (buf.version,"/lp-" ); +if (klp_tag) { + right_brace =strchr (klp_tag,')' ); +if (right_brace) +memmove (klp_tag, right_brace,sizeof (char ) * (strlen (right_brace)+1 ));sizeof(char) == 1 by definition :)
Merged, with this tiny fix + extended commit message. Thanks for your patch!
Kind regards,
Petr