aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2018-12-14 11:56:10 -0500
committerJiri Kosina <jkosina@suse.cz>2018-12-18 04:23:07 -0500
commit5f30b2e823484ce6a79f2b59901b6351c15effa6 (patch)
tree4bafe61acde2fdb571e39eea272b3ca09b3be520
parent3933ec73cd9bbff4a98259d0eae606af4e2850a2 (diff)
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>
-rw-r--r--samples/livepatch/livepatch-shadow-fix1.c5
-rw-r--r--samples/livepatch/livepatch-shadow-mod.c4
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)
89 * pointer to handle resource release. 89 * pointer to handle resource release.
90 */ 90 */
91 leak = kzalloc(sizeof(int), GFP_KERNEL); 91 leak = kzalloc(sizeof(int), GFP_KERNEL);
92 if (!leak) {
93 kfree(d);
94 return NULL;
95 }
96
92 klp_shadow_alloc(d, SV_LEAK, sizeof(leak), GFP_KERNEL, 97 klp_shadow_alloc(d, SV_LEAK, sizeof(leak), GFP_KERNEL,
93 shadow_leak_ctor, leak); 98 shadow_leak_ctor, leak);
94 99
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)
118 118
119 /* Oops, forgot to save leak! */ 119 /* Oops, forgot to save leak! */
120 leak = kzalloc(sizeof(int), GFP_KERNEL); 120 leak = kzalloc(sizeof(int), GFP_KERNEL);
121 if (!leak) {
122 kfree(d);
123 return NULL;
124 }
121 125
122 pr_info("%s: dummy @ %p, expires @ %lx\n", 126 pr_info("%s: dummy @ %p, expires @ %lx\n",
123 __func__, d, d->jiffies_expire); 127 __func__, d, d->jiffies_expire);