* [PATCH] [BUGFIX] kprobes/x86: Release insn_slot in failure path
@ 2017-07-21 14:45 Masami Hiramatsu
2017-07-24 10:19 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
0 siblings, 1 reply; 2+ messages in thread
From: Masami Hiramatsu @ 2017-07-21 14:45 UTC (permalink / raw)
To: Ingo Molnar
Cc: Thomas Gleixner, Ingo Molnar, H . Peter Anvin, x86,
Masami Hiramatsu, Ananth N Mavinakayanahalli,
Anil S Keshavamurthy, David S . Miller, linux-kernel
The commit 003002e04ed3 ("kprobes: Fix arch_prepare_kprobe
to handle copy insn failures") returns error if copying
insn failed, but not release allocated insn_slot.
Release insn_slot assigned to ainsn.slot correctly if
copy insn is failed.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Fixes: 003002e04ed3 ("kprobes: Fix arch_prepare_kprobe to handle copy insn failures")
---
arch/x86/kernel/kprobes/core.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 6b87780..f015371 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -457,6 +457,8 @@ static int arch_copy_kprobe(struct kprobe *p)
int arch_prepare_kprobe(struct kprobe *p)
{
+ int ret;
+
if (alternatives_text_reserved(p->addr, p->addr))
return -EINVAL;
@@ -467,7 +469,13 @@ int arch_prepare_kprobe(struct kprobe *p)
if (!p->ainsn.insn)
return -ENOMEM;
- return arch_copy_kprobe(p);
+ ret = arch_copy_kprobe(p);
+ if (ret) {
+ free_insn_slot(p->ainsn.insn, 0);
+ p->ainsn.insn = NULL;
+ }
+
+ return ret;
}
void arch_arm_kprobe(struct kprobe *p)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:perf/urgent] kprobes/x86: Release insn_slot in failure path
2017-07-21 14:45 [PATCH] [BUGFIX] kprobes/x86: Release insn_slot in failure path Masami Hiramatsu
@ 2017-07-24 10:19 ` tip-bot for Masami Hiramatsu
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Masami Hiramatsu @ 2017-07-24 10:19 UTC (permalink / raw)
To: linux-tip-commits
Cc: mhiramat, hpa, linux-kernel, torvalds, peterz, tglx, davem,
ananth, mingo, anil.s.keshavamurthy
Commit-ID: 38115f2f8cec8087d558c062e779c443a01f87d6
Gitweb: http://git.kernel.org/tip/38115f2f8cec8087d558c062e779c443a01f87d6
Author: Masami Hiramatsu <mhiramat@kernel.org>
AuthorDate: Fri, 21 Jul 2017 23:45:52 +0900
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 24 Jul 2017 11:14:59 +0200
kprobes/x86: Release insn_slot in failure path
The following commit:
003002e04ed3 ("kprobes: Fix arch_prepare_kprobe to handle copy insn failures")
returns an error if the copying of the instruction, but does not release
the allocated insn_slot.
Clean up correctly.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: David S . Miller <davem@davemloft.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 003002e04ed3 ("kprobes: Fix arch_prepare_kprobe to handle copy insn failures")
Link: http://lkml.kernel.org/r/150064834183.6172.11694375818447664416.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/kprobes/core.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 6b87780..f015371 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -457,6 +457,8 @@ static int arch_copy_kprobe(struct kprobe *p)
int arch_prepare_kprobe(struct kprobe *p)
{
+ int ret;
+
if (alternatives_text_reserved(p->addr, p->addr))
return -EINVAL;
@@ -467,7 +469,13 @@ int arch_prepare_kprobe(struct kprobe *p)
if (!p->ainsn.insn)
return -ENOMEM;
- return arch_copy_kprobe(p);
+ ret = arch_copy_kprobe(p);
+ if (ret) {
+ free_insn_slot(p->ainsn.insn, 0);
+ p->ainsn.insn = NULL;
+ }
+
+ return ret;
}
void arch_arm_kprobe(struct kprobe *p)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-07-24 10:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-21 14:45 [PATCH] [BUGFIX] kprobes/x86: Release insn_slot in failure path Masami Hiramatsu
2017-07-24 10:19 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
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).