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

Merge branch 'for-5.18/selftests-fixes' into for-linus

This commit is contained in:
Petr Mladek 2022-03-28 10:56:22 +02:00
parent 2957308343 5e6ded2e7a
commit e7dbd4d536
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/livepatch/livepatch-shadow-fix1.c
View File

@ -109,9 +109,9 @@ static void livepatch_fix1_dummy_leak_dtor(void *obj, void *shadow_data)
void *d = obj; void *d = obj;
int **shadow_leak = shadow_data; int **shadow_leak = shadow_data;
kfree(*shadow_leak);
pr_info("%s: dummy @ %p, prevented leak @ %p\n", pr_info("%s: dummy @ %p, prevented leak @ %p\n",
__func__, d, *shadow_leak); __func__, d, *shadow_leak);
kfree(*shadow_leak);
} }
static void livepatch_fix1_dummy_free(struct dummy *d) static void livepatch_fix1_dummy_free(struct dummy *d)

2
samples/livepatch/livepatch-shadow-fix2.c
View File

@ -61,9 +61,9 @@ static void livepatch_fix2_dummy_leak_dtor(void *obj, void *shadow_data)
void *d = obj; void *d = obj;
int **shadow_leak = shadow_data; int **shadow_leak = shadow_data;
kfree(*shadow_leak);
pr_info("%s: dummy @ %p, prevented leak @ %p\n", pr_info("%s: dummy @ %p, prevented leak @ %p\n",
__func__, d, *shadow_leak); __func__, d, *shadow_leak);
kfree(*shadow_leak);
} }
static void livepatch_fix2_dummy_free(struct dummy *d) static void livepatch_fix2_dummy_free(struct dummy *d)

22
tools/testing/selftests/livepatch/functions.sh
View File

@ -75,9 +75,25 @@ function set_dynamic_debug() {
} }
function set_ftrace_enabled() { function set_ftrace_enabled() {
result=$(sysctl -q kernel.ftrace_enabled="$1" 2>&1 && \ local can_fail=0
sysctl kernel.ftrace_enabled 2>&1) if [[ "$1" == "--fail" ]] ; then
echo "livepatch: $result" > /dev/kmsg can_fail=1
shift
fi
local err=$(sysctl -q kernel.ftrace_enabled="$1" 2>&1)
local result=$(sysctl --values kernel.ftrace_enabled)
if [[ "$result" != "$1" ]] ; then
if [[ $can_fail -eq 1 ]] ; then
echo "livepatch: $err" > /dev/kmsg
return
fi
skip "failed to set kernel.ftrace_enabled = $1"
fi
echo "livepatch: kernel.ftrace_enabled = $result" > /dev/kmsg
} }
function cleanup() { function cleanup() {

3
tools/testing/selftests/livepatch/test-ftrace.sh
View File

@ -25,7 +25,8 @@ if [[ "$(cat /proc/cmdline)" != "$MOD_LIVEPATCH: this has been live patched" ]]
die "livepatch kselftest(s) failed" die "livepatch kselftest(s) failed"
fi fi
set_ftrace_enabled 0 # Check that ftrace could not get disabled when a livepatch is enabled
set_ftrace_enabled --fail 0
if [[ "$(cat /proc/cmdline)" != "$MOD_LIVEPATCH: this has been live patched" ]] ; then if [[ "$(cat /proc/cmdline)" != "$MOD_LIVEPATCH: this has been live patched" ]] ; then
echo -e "FAIL\n\n" echo -e "FAIL\n\n"
die "livepatch kselftest(s) failed" die "livepatch kselftest(s) failed"