diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-04 08:23:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-04 08:23:03 +0200 |
| commit | c0554d2d3db438623b4f2f9abc3d766b2b15d2fb (patch) | |
| tree | d00dc324772b95373f4bdc566b3437e5bf637157 /arch/powerpc/lib/code-patching.c | |
| parent | bef459026b161fbc39d20dcba698ed0cfffbac38 (diff) | |
| parent | 1d2ba7fee28b3a47cca8e8f4f94a22d30b2b3a6f (diff) | |
Merge branch 'linus' into x86/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/lib/code-patching.c')
| -rw-r--r-- | arch/powerpc/lib/code-patching.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c index 850f3b8f4da5..6ae2777c220d 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -28,6 +28,12 @@ static int __patch_instruction(unsigned int *exec_addr, unsigned int instr, { int err; + /* Make sure we aren't patching a freed init section */ + if (init_mem_is_free && init_section_contains(exec_addr, 4)) { + pr_debug("Skipping init section patching addr: 0x%px\n", exec_addr); + return 0; + } + __put_user_size(instr, patch_addr, 4, err); if (err) return err; |