diff options
| author | Nicholas Mc Guire <hofrat@osadl.org> | 2018-12-14 17:56:10 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-12-18 10:23:07 +0100 |
| commit | 5f30b2e823484ce6a79f2b59901b6351c15effa6 (patch) | |
| tree | 4bafe61acde2fdb571e39eea272b3ca09b3be520 /samples/livepatch | |
| parent | 3933ec73cd9bbff4a98259d0eae606af4e2850a2 (diff) | |
| download | lwn-5f30b2e823484ce6a79f2b59901b6351c15effa6.tar.gz lwn-5f30b2e823484ce6a79f2b59901b6351c15effa6.zip | |
livepatch: check kzalloc return values
kzalloc() return should always be checked - notably in example code
where this may be seen as reference. On failure of allocation in
livepatch_fix1_dummy_alloc() respectively dummy_alloc() previous
allocation is freed (thanks to Petr Mladek <pmladek@suse.com> for
catching this) and NULL returned.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Fixes: 439e7271dc2b ("livepatch: introduce shadow variable API")
Acked-by: Joe Lawrence <joe.lawrence@redhat.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Acked-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'samples/livepatch')
| -rw-r--r-- | samples/livepatch/livepatch-shadow-fix1.c | 5 | ||||
| -rw-r--r-- | samples/livepatch/livepatch-shadow-mod.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/samples/livepatch/livepatch-shadow-fix1.c b/samples/livepatch/livepatch-shadow-fix1.c index 49b13553eaae..e8f1bd6b29b1 100644 --- a/samples/livepatch/livepatch-shadow-fix1.c +++ b/samples/livepatch/livepatch-shadow-fix1.c @@ -89,6 +89,11 @@ struct dummy *livepatch_fix1_dummy_alloc(void) * pointer to handle resource release. */ leak = kzalloc(sizeof(int), GFP_KERNEL); + if (!leak) { + kfree(d); + return NULL; + } + klp_shadow_alloc(d, SV_LEAK, sizeof(leak), GFP_KERNEL, shadow_leak_ctor, leak); diff --git a/samples/livepatch/livepatch-shadow-mod.c b/samples/livepatch/livepatch-shadow-mod.c index 4c54b250332d..4aa8a88d3cd6 100644 --- a/samples/livepatch/livepatch-shadow-mod.c +++ b/samples/livepatch/livepatch-shadow-mod.c @@ -118,6 +118,10 @@ noinline struct dummy *dummy_alloc(void) /* Oops, forgot to save leak! */ leak = kzalloc(sizeof(int), GFP_KERNEL); + if (!leak) { + kfree(d); + return NULL; + } pr_info("%s: dummy @ %p, expires @ %lx\n", __func__, d, d->jiffies_expire); |