]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
livepatch: robustify klp_register_patch() API error checking
authorJiri Kosina <jkosina@suse.cz>
Thu, 7 Apr 2016 16:06:25 +0000 (18:06 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 7 Apr 2016 18:42:38 +0000 (20:42 +0200)
Commit 425595a7fc20 ("livepatch: reuse module loader code to write
relocations") adds a possibility of dereferncing pointers supplied by the
consumer of the livepatch API before sanity (NULL) checking them (patch
and patch->mod).

Spotted by smatch tool.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Acked-by: Jessica Yu <jeyu@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
kernel/livepatch/core.c

index eb5db6e837aae1f0ba9c06b88f1903e0c3acc4bb..28c37fa3d3f951230ddafd1a2973ff7bd3d6bfe8 100644 (file)
@@ -876,6 +876,9 @@ int klp_register_patch(struct klp_patch *patch)
 {
        int ret;
 
+       if (!patch || !patch->mod)
+               return -EINVAL;
+
        if (!is_livepatch_module(patch->mod)) {
                pr_err("module %s is not marked as a livepatch module",
                       patch->mod->name);
@@ -885,9 +888,6 @@ int klp_register_patch(struct klp_patch *patch)
        if (!klp_initialized())
                return -ENODEV;
 
-       if (!patch || !patch->mod)
-               return -EINVAL;
-
        /*
         * A reference is taken on the patch module to prevent it from being
         * unloaded.  Right now, we don't allow patch modules to unload since