Commit f46e49a9 authored by Petr Mladek's avatar Petr Mladek Committed by Jiri Kosina

livepatch: Handle allocation failure in the sample of shadow variable API

klp_shadow_alloc() is not handled in the sample of shadow variable API.
It is not strictly necessary because livepatch_fix1_dummy_free() is
able to handle the potential failure. But it is an example and it should
use the API a clean way.
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
Reviewed-by: default avatarJoe Lawrence <joe.lawrence@redhat.com>
Acked-by: default avatarMiroslav Benes <mbenes@suse.cz>
Reviewed-by: default avatarKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent be6da984
...@@ -66,6 +66,7 @@ static struct dummy *livepatch_fix1_dummy_alloc(void) ...@@ -66,6 +66,7 @@ static struct dummy *livepatch_fix1_dummy_alloc(void)
{ {
struct dummy *d; struct dummy *d;
int *leak; int *leak;
int **shadow_leak;
d = kzalloc(sizeof(*d), GFP_KERNEL); d = kzalloc(sizeof(*d), GFP_KERNEL);
if (!d) if (!d)
...@@ -80,18 +81,27 @@ static struct dummy *livepatch_fix1_dummy_alloc(void) ...@@ -80,18 +81,27 @@ static struct dummy *livepatch_fix1_dummy_alloc(void)
* pointer to handle resource release. * pointer to handle resource release.
*/ */
leak = kzalloc(sizeof(*leak), GFP_KERNEL); leak = kzalloc(sizeof(*leak), GFP_KERNEL);
if (!leak) { if (!leak)
kfree(d); goto err_leak;
return NULL;
shadow_leak = klp_shadow_alloc(d, SV_LEAK, sizeof(leak), GFP_KERNEL,
shadow_leak_ctor, &leak);
if (!shadow_leak) {
pr_err("%s: failed to allocate shadow variable for the leaking pointer: dummy @ %p, leak @ %p\n",
__func__, d, leak);
goto err_shadow;
} }
klp_shadow_alloc(d, SV_LEAK, sizeof(leak), GFP_KERNEL,
shadow_leak_ctor, &leak);
pr_info("%s: dummy @ %p, expires @ %lx\n", pr_info("%s: dummy @ %p, expires @ %lx\n",
__func__, d, d->jiffies_expire); __func__, d, d->jiffies_expire);
return d; return d;
err_shadow:
kfree(leak);
err_leak:
kfree(d);
return NULL;
} }
static void livepatch_fix1_dummy_leak_dtor(void *obj, void *shadow_data) static void livepatch_fix1_dummy_leak_dtor(void *obj, void *shadow_data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment