From: Petr Mladek <pmladek@suse.com>
To: Jiri Kosina <jikos@kernel.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Miroslav Benes <mbenes@suse.cz>
Cc: Joe Lawrence <joe.lawrence@redhat.com>,
Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>,
Nicolai Stange <nstange@suse.de>,
live-patching@vger.kernel.org, linux-kernel@vger.kernel.org,
Petr Mladek <pmladek@suse.com>
Subject: [POC 03/23] livepatch: Better checks of struct klp_object definition
Date: Fri, 17 Jan 2020 16:03:03 +0100 [thread overview]
Message-ID: <20200117150323.21801-4-pmladek@suse.com> (raw)
In-Reply-To: <20200117150323.21801-1-pmladek@suse.com>
The number of user defined fields increased in struct klp_object after
spliting per-object livepatches. It was sometimes unclear why exactly
the module could not get loded when returned -EINVAL.
Add more checks for the split modules and write useful error
messages on particular errors.
Signed-off-by: Petr Mladek <pmladek@suse.com>
---
kernel/livepatch/core.c | 91 ++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 82 insertions(+), 9 deletions(-)
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index bb62c5407b75..ec7ffc7db3a7 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -756,9 +756,6 @@ static int klp_init_object(struct klp_patch *patch, struct klp_object *obj)
int ret;
const char *name;
- if (klp_is_module(obj) && strlen(obj->name) >= MODULE_NAME_LEN)
- return -EINVAL;
-
obj->patched = false;
name = obj->name ? obj->name : "vmlinux";
@@ -851,8 +848,86 @@ static int klp_init_patch(struct klp_patch *patch)
return 0;
}
+static int klp_check_module_name(struct klp_object *obj, bool is_module)
+{
+ char mod_name[MODULE_NAME_LEN];
+ const char *expected_name;
+
+ if (is_module) {
+ snprintf(mod_name, sizeof(mod_name), "%s__%s",
+ obj->patch_name, obj->name);
+ expected_name = mod_name;
+ } else {
+ expected_name = obj->patch_name;
+ }
+
+ if (strcmp(expected_name, obj->mod->name)) {
+ pr_err("The module name %s does not match with obj->patch_name and obj->name. The expected name is: %s\n",
+ obj->mod->name, expected_name);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int klp_check_object(struct klp_object *obj, bool is_module)
+{
+
+ if (!obj->mod)
+ return -EINVAL;
+
+ if (!is_livepatch_module(obj->mod)) {
+ pr_err("module %s is not marked as a livepatch module\n",
+ obj->mod->name);
+ return -EINVAL;
+ }
+
+ if (!obj->patch_name) {
+ pr_err("module %s does not have set obj->patch_name\n",
+ obj->mod->name);
+ return -EINVAL;
+ }
+
+ if (strlen(obj->patch_name) >= MODULE_NAME_LEN) {
+ pr_err("module %s has too long obj->patch_name\n",
+ obj->mod->name);
+ return -EINVAL;
+ }
+
+ if (is_module) {
+ if (!obj->name) {
+ pr_err("module %s does not have set obj->name\n",
+ obj->mod->name);
+ return -EINVAL;
+ }
+ if (strlen(obj->name) >= MODULE_NAME_LEN) {
+ pr_err("module %s has too long obj->name\n",
+ obj->mod->name);
+ return -EINVAL;
+ }
+ } else if (obj->name) {
+ pr_err("module %s for vmlinux must not have set obj->name\n",
+ obj->mod->name);
+ return -EINVAL;
+ }
+
+ if (!obj->funcs) {
+ pr_err("module %s does not have set obj->funcs\n",
+ obj->mod->name);
+ return -EINVAL;
+ }
+
+ return klp_check_module_name(obj, is_module);
+}
+
int klp_add_object(struct klp_object *obj)
{
+ int ret;
+
+ ret = klp_check_object(obj, true);
+ if (ret)
+ return ret;
+
return 0;
}
EXPORT_SYMBOL_GPL(klp_add_object);
@@ -958,14 +1033,12 @@ int klp_enable_patch(struct klp_patch *patch)
{
int ret;
- if (!patch || !patch->obj || !patch->obj->mod)
+ if (!patch || !patch->obj)
return -EINVAL;
- if (!is_livepatch_module(patch->obj->mod)) {
- pr_err("module %s is not marked as a livepatch module\n",
- patch->obj->patch_name);
- return -EINVAL;
- }
+ ret = klp_check_object(patch->obj, false);
+ if (ret)
+ return ret;
if (!klp_initialized())
return -ENODEV;
--
2.16.4
next prev parent reply other threads:[~2020-01-17 15:03 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-17 15:03 [POC 00/23] livepatch: Split livepatch module per-object Petr Mladek
2020-01-17 15:03 ` [POC 01/23] module: Allow to delete module also from inside kernel Petr Mladek
2020-01-21 11:11 ` Julien Thierry
2020-01-17 15:03 ` [POC 02/23] livepatch: Split livepatch modules per livepatched object Petr Mladek
2020-01-21 11:11 ` Julien Thierry
2020-01-28 12:16 ` Petr Mladek
2020-01-17 15:03 ` Petr Mladek [this message]
2020-01-21 11:27 ` [POC 03/23] livepatch: Better checks of struct klp_object definition Julien Thierry
2020-01-17 15:03 ` [POC 04/23] livepatch: Prevent loading livepatch sub-module unintentionally Petr Mladek
2020-04-03 17:54 ` Joe Lawrence
2020-01-17 15:03 ` [POC 05/23] livepatch: Initialize and free livepatch submodule Petr Mladek
2020-01-21 11:58 ` Julien Thierry
2020-01-17 15:03 ` [POC 06/23] livepatch: Enable the " Petr Mladek
2020-01-17 15:03 ` [POC 07/23] livepatch: Remove obsolete functionality from klp_module_coming() Petr Mladek
2020-01-17 15:03 ` [POC 08/23] livepatch: Automatically load livepatch module when the patch module is loaded Petr Mladek
2020-01-17 15:03 ` [POC 09/23] livepatch: Handle race when livepatches are reloaded during a module load Petr Mladek
2020-01-22 18:51 ` Julien Thierry
2020-01-17 15:03 ` [POC 10/23] livepatch: Handle modprobe exit code Petr Mladek
2020-01-17 15:03 ` [POC 11/23] livepatch: Safely detect forced transition when removing split livepatch modules Petr Mladek
2020-01-22 10:15 ` Julien Thierry
2020-01-17 15:03 ` [POC 12/23] livepatch: Automatically remove livepatch module when the object is freed Petr Mladek
2020-01-17 15:03 ` [POC 13/23] livepatch: Remove livepatch module when the livepatched module is unloaded Petr Mladek
2020-01-17 15:03 ` [POC 14/23] livepatch: Never block livepatch modules when the related module is being removed Petr Mladek
2020-01-17 15:03 ` [POC 15/23] livepatch: Prevent infinite loop when loading livepatch module Petr Mladek
2020-01-17 15:03 ` [POC 16/23] livepatch: Add patch into the global list early Petr Mladek
2020-01-17 15:03 ` [POC 17/23] livepatch: Load livepatches for modules when loading the main livepatch Petr Mladek
2020-01-17 15:03 ` [POC 18/23] module: Refactor add_unformed_module() Petr Mladek
2020-01-17 15:03 ` [POC 19/23] module/livepatch: Allow to use exported symbols from livepatch module for "vmlinux" Petr Mladek
2020-04-06 18:48 ` Joe Lawrence
2020-04-07 7:33 ` Miroslav Benes
2020-04-07 20:57 ` Joe Lawrence
2020-01-17 15:03 ` [POC 20/23] module/livepatch: Relocate local variables in the module loaded when the livepatch is being loaded Petr Mladek
2020-01-18 10:29 ` kbuild test robot
2020-04-03 18:00 ` Joe Lawrence
2020-01-17 15:03 ` [POC 21/23] livepatch: Remove obsolete arch_klp_init_object_loaded() Petr Mladek
2020-01-17 15:03 ` [POC 22/23] livepatch/module: Remove obsolete copy_module_elf() Petr Mladek
2020-04-03 18:03 ` Joe Lawrence
2020-01-17 15:03 ` [POC 23/23] module: Remove obsolete module_disable_ro() Petr Mladek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200117150323.21801-4-pmladek@suse.com \
--to=pmladek@suse.com \
--cc=jikos@kernel.org \
--cc=joe.lawrence@redhat.com \
--cc=jpoimboe@redhat.com \
--cc=kamalesh@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=live-patching@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=nstange@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).