Livepatching changes for 6.2
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEESH4wyp42V4tXvYsjUqAMR0iAlPIFAmOXOe0ACgkQUqAMR0iA lPL4Qg//aqlwtM/i2Mkz4Vd0NBlT+CqYO2aUZrODNefOv5ok+cOZmcwcRzr5sPQw USJZ7LKvz6OgTw+NkHFYfPhu7aRj0kBknqtorhw8NgCVI6vCXzcZF0JzsZ+1E5IS xg5XNV+iDWe2fgXgqtJaPAiLlxlo/fuvizlkJ9GSUsMmBUS6QVkjLpCmk/5LNYdc +ZXroqXkB+2q0nnKYu4+di8vlnFrMxuGO0fPw7VnOsvEy9drnyrpiWzl+t2NV+Q6 GV9T5bxyQgP7wlMVn5IZa8QZL2Vh7jGEVaEkW7JuEspokytqXPSw4e03BaDjfKOl MMulLI+yizrKkHRMLcrVzNcECbTZ9qbRXOmaa7FuxabPkZ+JcnkKYdVQa8/Sq9to TssL8yTNFWGnjMVLUbgXuxMaOz1oLugc8nUxOhB9JIgEO+LvwTRRlu0LTnrvx19k 7peRzu4GkPSToKqrdMmJVw7nIX2sUnrOGLXJ/MK/WpZ61MZoi0Ppd0oo8lDrv9oq mP/D9RG2nOCdbHfYDLAxqvV5DWeHDDHmEoqIacenPyWOBRZGThhV7++/q6OIlyvD wuM6RMqzTe4JPlDrSlGX4tgFpf260BezoRJebLaL3k1YQl5xU40pII/16RdayR3f w8RelBdpaY4rudg9Qm+/5nAXrlCS4Y5vijAOuNpXC9AZze40SX8= =hkCN -----END PGP SIGNATURE----- Merge tag 'livepatching-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching Pull livepatching update from Petr Mladek: - code cleanup * tag 'livepatching-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching: livepatch: Move the result-invariant calculation out of the loop
This commit is contained in:
Коммит
e1a1ccef7a
|
@ -196,37 +196,37 @@ static int klp_check_stack_func(struct klp_func *func, unsigned long *entries,
|
|||
struct klp_ops *ops;
|
||||
int i;
|
||||
|
||||
if (klp_target_state == KLP_UNPATCHED) {
|
||||
/*
|
||||
* Check for the to-be-unpatched function
|
||||
* (the func itself).
|
||||
*/
|
||||
func_addr = (unsigned long)func->new_func;
|
||||
func_size = func->new_size;
|
||||
} else {
|
||||
/*
|
||||
* Check for the to-be-patched function
|
||||
* (the previous func).
|
||||
*/
|
||||
ops = klp_find_ops(func->old_func);
|
||||
|
||||
if (list_is_singular(&ops->func_stack)) {
|
||||
/* original function */
|
||||
func_addr = (unsigned long)func->old_func;
|
||||
func_size = func->old_size;
|
||||
} else {
|
||||
/* previously patched function */
|
||||
struct klp_func *prev;
|
||||
|
||||
prev = list_next_entry(func, stack_node);
|
||||
func_addr = (unsigned long)prev->new_func;
|
||||
func_size = prev->new_size;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < nr_entries; i++) {
|
||||
address = entries[i];
|
||||
|
||||
if (klp_target_state == KLP_UNPATCHED) {
|
||||
/*
|
||||
* Check for the to-be-unpatched function
|
||||
* (the func itself).
|
||||
*/
|
||||
func_addr = (unsigned long)func->new_func;
|
||||
func_size = func->new_size;
|
||||
} else {
|
||||
/*
|
||||
* Check for the to-be-patched function
|
||||
* (the previous func).
|
||||
*/
|
||||
ops = klp_find_ops(func->old_func);
|
||||
|
||||
if (list_is_singular(&ops->func_stack)) {
|
||||
/* original function */
|
||||
func_addr = (unsigned long)func->old_func;
|
||||
func_size = func->old_size;
|
||||
} else {
|
||||
/* previously patched function */
|
||||
struct klp_func *prev;
|
||||
|
||||
prev = list_next_entry(func, stack_node);
|
||||
func_addr = (unsigned long)prev->new_func;
|
||||
func_size = prev->new_size;
|
||||
}
|
||||
}
|
||||
|
||||
if (address >= func_addr && address < func_addr + func_size)
|
||||
return -EAGAIN;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче