diff options
author | 2022-03-28 10:56:22 +0200 | |
---|---|---|
committer | 2022-03-28 10:56:22 +0200 | |
commit | e7dbd4d5369df7d101d6fde5595229df7060939d (patch) | |
tree | f9759b5a717f03b2ac3ef8de0e623dae639127ce /samples | |
parent | livepatch: Don't block removal of patches that are safe to unload (diff) | |
parent | livepatch: Reorder to use before freeing a pointer (diff) | |
download | wireguard-linux-e7dbd4d5369df7d101d6fde5595229df7060939d.tar.xz wireguard-linux-e7dbd4d5369df7d101d6fde5595229df7060939d.zip |
Merge branch 'for-5.18/selftests-fixes' into for-linus
Diffstat (limited to 'samples')
-rw-r--r-- | samples/livepatch/livepatch-shadow-fix1.c | 2 | ||||
-rw-r--r-- | samples/livepatch/livepatch-shadow-fix2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/samples/livepatch/livepatch-shadow-fix1.c b/samples/livepatch/livepatch-shadow-fix1.c index 918ce17b43fd..6701641bf12d 100644 --- a/samples/livepatch/livepatch-shadow-fix1.c +++ b/samples/livepatch/livepatch-shadow-fix1.c @@ -109,9 +109,9 @@ static void livepatch_fix1_dummy_leak_dtor(void *obj, void *shadow_data) void *d = obj; int **shadow_leak = shadow_data; - kfree(*shadow_leak); pr_info("%s: dummy @ %p, prevented leak @ %p\n", __func__, d, *shadow_leak); + kfree(*shadow_leak); } static void livepatch_fix1_dummy_free(struct dummy *d) diff --git a/samples/livepatch/livepatch-shadow-fix2.c b/samples/livepatch/livepatch-shadow-fix2.c index 29fe5cd42047..361046a4f10c 100644 --- a/samples/livepatch/livepatch-shadow-fix2.c +++ b/samples/livepatch/livepatch-shadow-fix2.c @@ -61,9 +61,9 @@ static void livepatch_fix2_dummy_leak_dtor(void *obj, void *shadow_data) void *d = obj; int **shadow_leak = shadow_data; - kfree(*shadow_leak); pr_info("%s: dummy @ %p, prevented leak @ %p\n", __func__, d, *shadow_leak); + kfree(*shadow_leak); } static void livepatch_fix2_dummy_free(struct dummy *d) |