Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5e547f4 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Jiri Kosina
Browse files

livepatch: store function sizes 



For the consistency model we'll need to know the sizes of the old and
new functions to determine if they're on the stacks of any tasks.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Acked-by: default avatarMiroslav Benes <mbenes@suse.cz>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Reviewed-by: default avatarKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 68ae4b2b

include/linux/livepatch.h

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
 * @old_addr:	the address of the function being patched

 * @kobj:	kobject for sysfs resources

 * @stack_node:	list node for klp_ops func_stack list

 * @old_size:	size of the old function

 * @new_size:	size of the new function

 * @patched:	the func has been added to the klp_ops list

 */

struct klp_func {
@@ -56,6 +58,7 @@ struct klp_func { 
	unsigned long old_addr;

	struct kobject kobj;

	struct list_head stack_node;

	unsigned long old_size, new_size;

	bool patched;

};

kernel/livepatch/core.c

+16 −0
Original line number Diff line number Diff line
@@ -584,6 +584,22 @@ static int klp_init_object_loaded(struct klp_patch *patch, 
					     &func->old_addr);

		if (ret)

			return ret;



		ret = kallsyms_lookup_size_offset(func->old_addr,

						  &func->old_size, NULL);

		if (!ret) {

			pr_err("kallsyms size lookup failed for '%s'\n",

			       func->old_name);

			return -ENOENT;

		}



		ret = kallsyms_lookup_size_offset((unsigned long)func->new_func,

						  &func->new_size, NULL);

		if (!ret) {

			pr_err("kallsyms size lookup failed for '%s' replacement\n",

			       func->old_name);

			return -ENOENT;

		}

	}



	return 0;