livepatch: Fix NULL pointer dereference in klp_find_func()
PATCH 1/1 livepatch: Fix NULL pointer dereference in klp_find_func()
A NULL old_name in a newly loaded livepatch's function entry causes a NULL pointer dereference in strcmp():
klp_init_patch()
klp_add_nops()
klp_find_func()
strcmp(old_func->old_name, func->old_name)Add a sanity check at the beginning of klp_enable_patch() to reject patches with NULL old_name before they reach this code path.
--- kernel/livepatch/core.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)
kernel/livepatch/core.c +22 -12
@@ -799,9 +799,6 @@ void klp_free_replaced_patches_async(struct klp_patch *new_patch)static int klp_init_func (struct klp_object *obj,struct klp_func *func) { -if (!func->old_name) -return -EINVAL ; -/* * NOPs get the address later. The patched module must be loaded, * see klp_init_object_loaded().
@@ -1092,6 +1089,25 @@ static int __klp_enable_patch(struct klp_patch *patch)return ret; } +static int klp_check_patch (struct klp_patch *patch) +{ +struct klp_object *obj; +struct klp_func *func; + +if (!patch || !patch->mod || !patch->objs) +return -EINVAL ; + +klp_for_each_object_static (patch, obj) { +if (!obj->funcs) +return -EINVAL ; +klp_for_each_func_static (obj, func) { +if (!func->old_name) +return -EINVAL ; + } + } +return 0 ; +} +/** * klp_enable_patch() - enable the livepatch * @patch: patch to be enabled
@@ -1108,16 +1124,10 @@ static int __klp_enable_patch(struct klp_patch *patch)int klp_enable_patch (struct klp_patch *patch) {int ret; -struct klp_object *obj; - -if (!patch || !patch->mod || !patch->objs) -return -EINVAL ; - -klp_for_each_object_static (patch, obj) { -if (!obj->funcs) -return -EINVAL ; - } + ret =klp_check_patch (patch); +if (ret) +return ret;if (!is_livepatch_module (patch->mod)) { pr_err("module %s is not marked as a livepatch module\n",
Signature · 1 line
2.52.0
Quoted 10 lines · Yafang Shao
A NULL
old_namein a newly loaded livepatch's function entry causes a NULL pointer dereference instrcmp():
klp_init_patch()klp_add_nops() klp_find_func() strcmp(old_func->old_name, func->old_name)Add a sanity check at the beginning of
klp_enable_patch()to reject patches with NULLold_namebefore they reach this code path.
The changelog could also mention the introduction of klp_check_patch().
M
PATCH v2 1/1 livepatch: Fix NULL pointer dereference in klp_find_func()
A NULL old_name in a newly loaded livepatch's function entry causes a NULL pointer dereference in strcmp():
klp_init_patch()
klp_add_nops()
klp_find_func()
strcmp(old_func->old_name, func->old_name)Add klp_check_patch() at the beginning of klp_enable_patch() to reject patches with NULL old_name before they reach this code path.
--- kernel/livepatch/core.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)
kernel/livepatch/core.c +22 -12
@@ -799,9 +799,6 @@ void klp_free_replaced_patches_async(struct klp_patch *new_patch)static int klp_init_func (struct klp_object *obj,struct klp_func *func) { -if (!func->old_name) -return -EINVAL ; -/* * NOPs get the address later. The patched module must be loaded, * see klp_init_object_loaded().
@@ -1092,6 +1089,25 @@ static int __klp_enable_patch(struct klp_patch *patch)return ret; } +static int klp_check_patch (struct klp_patch *patch) +{ +struct klp_object *obj; +struct klp_func *func; + +if (!patch || !patch->mod || !patch->objs) +return -EINVAL ; + +klp_for_each_object_static (patch, obj) { +if (!obj->funcs) +return -EINVAL ; +klp_for_each_func_static (obj, func) { +if (!func->old_name) +return -EINVAL ; + } + } +return 0 ; +} +/** * klp_enable_patch() - enable the livepatch * @patch: patch to be enabled
@@ -1108,16 +1124,10 @@ static int __klp_enable_patch(struct klp_patch *patch)int klp_enable_patch (struct klp_patch *patch) {int ret; -struct klp_object *obj; - -if (!patch || !patch->mod || !patch->objs) -return -EINVAL ; - -klp_for_each_object_static (patch, obj) { -if (!obj->funcs) -return -EINVAL ; - } + ret =klp_check_patch (patch); +if (ret) +return ret;if (!is_livepatch_module (patch->mod)) { pr_err("module %s is not marked as a livepatch module\n",
Signature · 1 line
2.52.0
Quoted 11 lines · Yafang Shao
A NULL
old_namein a newly loaded livepatch's function entry causes a NULL pointer dereference instrcmp():
klp_init_patch()klp_add_nops() klp_find_func() strcmp(old_func->old_name, func->old_name)Add
klp_check_patch()at the beginning ofklp_enable_patch()to reject patches with NULLold_namebefore they reach this code path.
Quoted 6 lines
Reported-by sashiko-bot <[email protected]>Suggested-by Petr Mladek <[email protected]>Suggested-by Miroslav Benes <[email protected]>Signed-off-by Yafang Shao <[email protected]>Acked-by Miroslav Benes <[email protected]>
Looks good to me:
I think whether to rush this into 7.2-rcX or wait for 7.3. On one hand, it is a possible security fix. On the other hand, broken module could never get loaded and pass even a minimal QA.
I tend to push it for 7.2-rcX just to avoid questions from people who ignore the real life vulnerabilty aspect.
Also see a nit below.
Quoted 7 lines
kernel/livepatch/core.c +1
-0@@ -1092,6 +1089,25 @@ static int __klp_enable_patch(struct klp_patch *patch)return ret; } +static int klp_check_patch (struct klp_patch *patch)
kernel/livepatch/core.c static int __klp_enable_patch(struct klp_patch *patch) · line 1102
Quoted 10 lines
kernel/livepatch/core.c +10
-0+{ +struct klp_object *obj; +struct klp_func *func; + +if (!patch || !patch->mod || !patch->objs) +return -EINVAL ; + +klp_for_each_object_static (patch, obj) { +if (!obj->funcs) +return -EINVAL ;
Nit: I would add an empty line here to make it better readable.
Of course, this is a personal preference. But it seems that most contributors to this code prefer visual separators between misc code sections as well.
No need for v3. I could add the empty line when pushing the change.
kernel/livepatch/core.c static int __klp_enable_patch(struct klp_patch *patch) · line 1113
Quoted 11 lines
kernel/livepatch/core.c +8
-0+klp_for_each_func_static (obj, func) { +if (!func->old_name) +return -EINVAL ; + } + } +return 0 ; +} +/** * klp_enable_patch() - enable the livepatch * @patch: patch to be enabled
Best Regards,
Petr
Petr Mladek
maintainerQuoted 11 lines · Yafang Shao
A NULL
old_namein a newly loaded livepatch's function entry causes a NULL pointer dereference instrcmp():
klp_init_patch()klp_add_nops() klp_find_func() strcmp(old_func->old_name, func->old_name)Add
klp_check_patch()at the beginning ofklp_enable_patch()to reject patches with NULLold_namebefore they reach this code path.
Quoted 6 lines
Reported-by sashiko-bot <[email protected]>Suggested-by Petr Mladek <[email protected]>Suggested-by Miroslav Benes <[email protected]>Signed-off-by Yafang Shao <[email protected]>Acked-by Miroslav Benes <[email protected]>
JFYI, the patch has been committed into livepatching.git, branch for-7.3/trivial.
Best Regards,
Petr