* [PATCH 1/2] perf/probe: verify instruction/offset in perf before adding a uprobe [not found] <20120412085748.23484.53789.stgit@nprashan.in.ibm.com> @ 2012-04-12 9:29 ` Prashanth Nageshappa 2012-04-12 13:01 ` Masami Hiramatsu 2012-04-13 3:24 ` [PATCH -tip ] x86: Handle failures of getting immediates in instruction decoder Masami Hiramatsu 0 siblings, 2 replies; 4+ messages in thread From: Prashanth Nageshappa @ 2012-04-12 9:29 UTC (permalink / raw) To: Peter Zijlstra, Ingo Molnar Cc: Andrew Morton, Linus Torvalds, Ananth N Mavinakayanahalli, Jim Keniston, LKML, Linux-mm, Oleg Nesterov, Andi Kleen, Christoph Hellwig, Steven Rostedt, Arnaldo Carvalho de Melo, Masami Hiramatsu, Thomas Gleixner, Anton Arapov, Srikar Dronamraju To verify instruction/offset in perf, before adding a uprobe we need to use arc/x86/lib/insn.c from perf code. Since perf Makefile enables -Wswitch-default flag it causes build warnings/failures. This patch is to address the build warnings in insn.c. Signed-off-by: Prashanth Nageshappa <prashanth@linux.vnet.ibm.com> --- arch/x86/lib/insn.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c index 25feb1a..b9e42f1 100644 --- a/arch/x86/lib/insn.c +++ b/arch/x86/lib/insn.c @@ -397,6 +397,8 @@ static void __get_moffset(struct insn *insn) insn->moffset2.value = get_next(int, insn); insn->moffset2.nbytes = 4; break; + default: + break; } insn->moffset1.got = insn->moffset2.got = 1; @@ -417,6 +419,8 @@ static void __get_immv32(struct insn *insn) insn->immediate.value = get_next(int, insn); insn->immediate.nbytes = 4; break; + default: + break; } err_out: @@ -441,6 +445,8 @@ static void __get_immv(struct insn *insn) insn->immediate2.value = get_next(int, insn); insn->immediate2.nbytes = 4; break; + default: + break; } insn->immediate1.got = insn->immediate2.got = 1; @@ -463,6 +469,8 @@ static void __get_immptr(struct insn *insn) case 8: /* ptr16:64 is not exist (no segment) */ return; + default: + break; } insn->immediate2.value = get_next(unsigned short, insn); insn->immediate2.nbytes = 2; -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] perf/probe: verify instruction/offset in perf before adding a uprobe 2012-04-12 9:29 ` [PATCH 1/2] perf/probe: verify instruction/offset in perf before adding a uprobe Prashanth Nageshappa @ 2012-04-12 13:01 ` Masami Hiramatsu 2012-04-13 3:24 ` [PATCH -tip ] x86: Handle failures of getting immediates in instruction decoder Masami Hiramatsu 1 sibling, 0 replies; 4+ messages in thread From: Masami Hiramatsu @ 2012-04-12 13:01 UTC (permalink / raw) To: Prashanth Nageshappa Cc: Peter Zijlstra, Ingo Molnar, Andrew Morton, Linus Torvalds, Ananth N Mavinakayanahalli, Jim Keniston, LKML, Linux-mm, Oleg Nesterov, Andi Kleen, Christoph Hellwig, Steven Rostedt, Arnaldo Carvalho de Melo, Thomas Gleixner, Anton Arapov, Srikar Dronamraju (2012/04/12 18:29), Prashanth Nageshappa wrote: > To verify instruction/offset in perf, before adding a uprobe we > need to use arc/x86/lib/insn.c from perf code. Since perf Makefile > enables -Wswitch-default flag it causes build warnings/failures. This > patch is to address the build warnings in insn.c. Hmm, I see the reason why we need this. However, I think it should have more correct error checking... I'll try that. Thank you, -- Masami HIRAMATSU Software Platform Research Dept. Linux Technology Center Hitachi, Ltd., Yokohama Research Laboratory E-mail: masami.hiramatsu.pt@hitachi.com -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH -tip ] x86: Handle failures of getting immediates in instruction decoder 2012-04-12 9:29 ` [PATCH 1/2] perf/probe: verify instruction/offset in perf before adding a uprobe Prashanth Nageshappa 2012-04-12 13:01 ` Masami Hiramatsu @ 2012-04-13 3:24 ` Masami Hiramatsu 2012-04-16 11:23 ` [tip:perf/urgent] x86: Handle failures of parsing immediate operands in the " tip-bot for Masami Hiramatsu 1 sibling, 1 reply; 4+ messages in thread From: Masami Hiramatsu @ 2012-04-13 3:24 UTC (permalink / raw) To: Peter Zijlstra, Ingo Molnar, Prashanth Nageshappa Cc: Andrew Morton, Linus Torvalds, Ananth N Mavinakayanahalli, Jim Keniston, LKML, Linux-mm, Oleg Nesterov, Andi Kleen, Christoph Hellwig, Steven Rostedt, Arnaldo Carvalho de Melo, Masami Hiramatsu, Thomas Gleixner, Anton Arapov, Srikar Dronamraju, yrl.pp-manager.tt Correctly handle failures when getting immediate operands in x86 instruction decoder. This can be happen if the instruction is badly longer than maximum length, or insn->opnd_bytes is manually changed. This patch also fixes warnings from -Wswitch-default flag. Reported-by: Prashanth Nageshappa <prashanth@linux.vnet.ibm.com> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> --- arch/x86/lib/insn.c | 53 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 36 insertions(+), 17 deletions(-) diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c index 25feb1a..b1e6c4b 100644 --- a/arch/x86/lib/insn.c +++ b/arch/x86/lib/insn.c @@ -379,8 +379,8 @@ err_out: return; } -/* Decode moffset16/32/64 */ -static void __get_moffset(struct insn *insn) +/* Decode moffset16/32/64. Return 0 if failed */ +static int __get_moffset(struct insn *insn) { switch (insn->addr_bytes) { case 2: @@ -397,15 +397,19 @@ static void __get_moffset(struct insn *insn) insn->moffset2.value = get_next(int, insn); insn->moffset2.nbytes = 4; break; + default: /* opnd_bytes must be modified manually */ + goto err_out; } insn->moffset1.got = insn->moffset2.got = 1; + return 1; + err_out: - return; + return 0; } -/* Decode imm v32(Iz) */ -static void __get_immv32(struct insn *insn) +/* Decode imm v32(Iz). Return 0 if failed */ +static int __get_immv32(struct insn *insn) { switch (insn->opnd_bytes) { case 2: @@ -417,14 +421,18 @@ static void __get_immv32(struct insn *insn) insn->immediate.value = get_next(int, insn); insn->immediate.nbytes = 4; break; + default: /* opnd_bytes must be modified manually */ + goto err_out; } + return 1; + err_out: - return; + return 0; } -/* Decode imm v64(Iv/Ov) */ -static void __get_immv(struct insn *insn) +/* Decode imm v64(Iv/Ov), Return 0 if failed */ +static int __get_immv(struct insn *insn) { switch (insn->opnd_bytes) { case 2: @@ -441,15 +449,18 @@ static void __get_immv(struct insn *insn) insn->immediate2.value = get_next(int, insn); insn->immediate2.nbytes = 4; break; + default: /* opnd_bytes must be modified manually */ + goto err_out; } insn->immediate1.got = insn->immediate2.got = 1; + return 1; err_out: - return; + return 0; } /* Decode ptr16:16/32(Ap) */ -static void __get_immptr(struct insn *insn) +static int __get_immptr(struct insn *insn) { switch (insn->opnd_bytes) { case 2: @@ -462,14 +473,17 @@ static void __get_immptr(struct insn *insn) break; case 8: /* ptr16:64 is not exist (no segment) */ - return; + return 0; + default: /* opnd_bytes must be modified manually */ + goto err_out; } insn->immediate2.value = get_next(unsigned short, insn); insn->immediate2.nbytes = 2; insn->immediate1.got = insn->immediate2.got = 1; + return 1; err_out: - return; + return 0; } /** @@ -489,7 +503,8 @@ void insn_get_immediate(struct insn *insn) insn_get_displacement(insn); if (inat_has_moffset(insn->attr)) { - __get_moffset(insn); + if (!__get_moffset(insn)) + goto err_out; goto done; } @@ -517,16 +532,20 @@ void insn_get_immediate(struct insn *insn) insn->immediate2.nbytes = 4; break; case INAT_IMM_PTR: - __get_immptr(insn); + if (!__get_immptr(insn)) + goto err_out; break; case INAT_IMM_VWORD32: - __get_immv32(insn); + if (!__get_immv32(insn)) + goto err_out; break; case INAT_IMM_VWORD: - __get_immv(insn); + if (!__get_immv(insn)) + goto err_out; break; default: - break; + /* Here, insn must have an immediate, but failed */ + goto err_out; } if (inat_has_second_immediate(insn->attr)) { insn->immediate2.value = get_next(char, insn); -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip:perf/urgent] x86: Handle failures of parsing immediate operands in the instruction decoder 2012-04-13 3:24 ` [PATCH -tip ] x86: Handle failures of getting immediates in instruction decoder Masami Hiramatsu @ 2012-04-16 11:23 ` tip-bot for Masami Hiramatsu 0 siblings, 0 replies; 4+ messages in thread From: tip-bot for Masami Hiramatsu @ 2012-04-16 11:23 UTC (permalink / raw) To: linux-tip-commits Cc: mingo, torvalds, peterz, anton, rostedt, jkenisto, oleg, tglx, linux-mm, hpa, linux-kernel, andi, prashanth, hch, ananth, masami.hiramatsu.pt, acme, srikar Commit-ID: 6c7b8e82aab75a25581c4d446fc87f96634e9ef9 Gitweb: http://git.kernel.org/tip/6c7b8e82aab75a25581c4d446fc87f96634e9ef9 Author: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> AuthorDate: Fri, 13 Apr 2012 12:24:27 +0900 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Mon, 16 Apr 2012 08:56:11 +0200 x86: Handle failures of parsing immediate operands in the instruction decoder This can happen if the instruction is much longer than the maximum length, or if insn->opnd_bytes is manually changed. This patch also fixes warnings from -Wswitch-default flag. Reported-by: Prashanth Nageshappa <prashanth@linux.vnet.ibm.com> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Cc: Jim Keniston <jkenisto@linux.vnet.ibm.com> Cc: Linux-mm <linux-mm@kvack.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: Christoph Hellwig <hch@infradead.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Arnaldo Carvalho de Melo <acme@infradead.org> Cc: Anton Arapov <anton@redhat.com> Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Cc: yrl.pp-manager.tt@hitachi.com Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20120413032427.32577.42602.stgit@localhost.localdomain Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/lib/insn.c | 53 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 36 insertions(+), 17 deletions(-) diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c index 25feb1a..b1e6c4b 100644 --- a/arch/x86/lib/insn.c +++ b/arch/x86/lib/insn.c @@ -379,8 +379,8 @@ err_out: return; } -/* Decode moffset16/32/64 */ -static void __get_moffset(struct insn *insn) +/* Decode moffset16/32/64. Return 0 if failed */ +static int __get_moffset(struct insn *insn) { switch (insn->addr_bytes) { case 2: @@ -397,15 +397,19 @@ static void __get_moffset(struct insn *insn) insn->moffset2.value = get_next(int, insn); insn->moffset2.nbytes = 4; break; + default: /* opnd_bytes must be modified manually */ + goto err_out; } insn->moffset1.got = insn->moffset2.got = 1; + return 1; + err_out: - return; + return 0; } -/* Decode imm v32(Iz) */ -static void __get_immv32(struct insn *insn) +/* Decode imm v32(Iz). Return 0 if failed */ +static int __get_immv32(struct insn *insn) { switch (insn->opnd_bytes) { case 2: @@ -417,14 +421,18 @@ static void __get_immv32(struct insn *insn) insn->immediate.value = get_next(int, insn); insn->immediate.nbytes = 4; break; + default: /* opnd_bytes must be modified manually */ + goto err_out; } + return 1; + err_out: - return; + return 0; } -/* Decode imm v64(Iv/Ov) */ -static void __get_immv(struct insn *insn) +/* Decode imm v64(Iv/Ov), Return 0 if failed */ +static int __get_immv(struct insn *insn) { switch (insn->opnd_bytes) { case 2: @@ -441,15 +449,18 @@ static void __get_immv(struct insn *insn) insn->immediate2.value = get_next(int, insn); insn->immediate2.nbytes = 4; break; + default: /* opnd_bytes must be modified manually */ + goto err_out; } insn->immediate1.got = insn->immediate2.got = 1; + return 1; err_out: - return; + return 0; } /* Decode ptr16:16/32(Ap) */ -static void __get_immptr(struct insn *insn) +static int __get_immptr(struct insn *insn) { switch (insn->opnd_bytes) { case 2: @@ -462,14 +473,17 @@ static void __get_immptr(struct insn *insn) break; case 8: /* ptr16:64 is not exist (no segment) */ - return; + return 0; + default: /* opnd_bytes must be modified manually */ + goto err_out; } insn->immediate2.value = get_next(unsigned short, insn); insn->immediate2.nbytes = 2; insn->immediate1.got = insn->immediate2.got = 1; + return 1; err_out: - return; + return 0; } /** @@ -489,7 +503,8 @@ void insn_get_immediate(struct insn *insn) insn_get_displacement(insn); if (inat_has_moffset(insn->attr)) { - __get_moffset(insn); + if (!__get_moffset(insn)) + goto err_out; goto done; } @@ -517,16 +532,20 @@ void insn_get_immediate(struct insn *insn) insn->immediate2.nbytes = 4; break; case INAT_IMM_PTR: - __get_immptr(insn); + if (!__get_immptr(insn)) + goto err_out; break; case INAT_IMM_VWORD32: - __get_immv32(insn); + if (!__get_immv32(insn)) + goto err_out; break; case INAT_IMM_VWORD: - __get_immv(insn); + if (!__get_immv(insn)) + goto err_out; break; default: - break; + /* Here, insn must have an immediate, but failed */ + goto err_out; } if (inat_has_second_immediate(insn->attr)) { insn->immediate2.value = get_next(char, insn); -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-04-16 11:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20120412085748.23484.53789.stgit@nprashan.in.ibm.com>
2012-04-12 9:29 ` [PATCH 1/2] perf/probe: verify instruction/offset in perf before adding a uprobe Prashanth Nageshappa
2012-04-12 13:01 ` Masami Hiramatsu
2012-04-13 3:24 ` [PATCH -tip ] x86: Handle failures of getting immediates in instruction decoder Masami Hiramatsu
2012-04-16 11:23 ` [tip:perf/urgent] x86: Handle failures of parsing immediate operands in the " 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).