Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching

Pull livepatch update from Jiri Kosina:
 "Return value checking fixup in livepatching samples, from Nicholas Mc
  Guire"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: check kzalloc return values

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);