{"id":817412,"url":"http://patchwork.ozlabs.org/api/patches/817412/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/e8e20b8b60f3140f74b92a7c9ef00c1c0f81b184.1505934128.git.naveen.n.rao@linux.vnet.ibm.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"","list_archive_url":"https://lore.kernel.org/linuxppc-dev/e8e20b8b60f3140f74b92a7c9ef00c1c0f81b184.1505934128.git.naveen.n.rao@linux.vnet.ibm.com/","date":"2017-09-22T09:10:48","name":"[v2,6/6] powerpc/jprobes: Validate break handler invocation as being due to a jprobe_return()","commit_ref":"3368f5699a9b0e281e14f9f93244da0a922f6df0","pull_url":null,"state":"accepted","archived":false,"hash":"cbf236b8afbeb462f19888573867ae59506a19c3","submitter":{"id":15185,"url":"http://patchwork.ozlabs.org/api/people/15185/?format=json","name":"Naveen N. Rao","email":"naveen.n.rao@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/e8e20b8b60f3140f74b92a7c9ef00c1c0f81b184.1505934128.git.naveen.n.rao@linux.vnet.ibm.com/mbox/","series":[{"id":4580,"url":"http://patchwork.ozlabs.org/api/series/4580/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=4580","date":"2017-09-22T09:10:23","name":"powerpc/kprobes: More fixes","version":2,"mbox":"http://patchwork.ozlabs.org/series/4580/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817412/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817412/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xz7KN0vdpz9s82\n\tfor ;\n\tFri, 22 Sep 2017 19:22:00 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xz7KM74LMzDsS0\n\tfor ;\n\tFri, 22 Sep 2017 19:21:59 +1000 (AEST)","from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com\n\t[148.163.156.1])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xz759421WzDsMB\n\tfor ;\n\tFri, 22 Sep 2017 19:11:25 +1000 (AEST)","from pps.filterd (m0098404.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv8M9AxXQ019498\n\tfor ; Fri, 22 Sep 2017 05:11:22 -0400","from e23smtp01.au.ibm.com (e23smtp01.au.ibm.com [202.81.31.143])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2d4ynp808a-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Fri, 22 Sep 2017 05:11:22 -0400","from localhost\n\tby e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from\n\t; Fri, 22 Sep 2017 19:11:20 +1000","from d23relay09.au.ibm.com (202.81.31.228)\n\tby e23smtp01.au.ibm.com (202.81.31.207) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tFri, 22 Sep 2017 19:11:17 +1000","from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138])\n\tby d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n\tv8M9BHXJ36503728\n\tfor ; Fri, 22 Sep 2017 19:11:17 +1000","from d23av02.au.ibm.com (localhost [127.0.0.1])\n\tby d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id\n\tv8M9B7vS020832\n\tfor ; Fri, 22 Sep 2017 19:11:08 +1000","from naverao1-tp.ibm.com ([9.77.124.51])\n\tby d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id\n\tv8M9AoTa020313; Fri, 22 Sep 2017 19:11:05 +1000"],"Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com\n\t(client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com;\n\tenvelope-from=naveen.n.rao@linux.vnet.ibm.com; receiver=)","From":"\"Naveen N. Rao\" ","To":"Michael Ellerman ","Subject":"[PATCH v2 6/6] powerpc/jprobes: Validate break handler invocation as\n\tbeing due to a jprobe_return()","Date":"Fri, 22 Sep 2017 14:40:48 +0530","X-Mailer":"git-send-email 2.14.1","In-Reply-To":["<9e98f74834af349564b71bc8443bdad55d6e37c6.1505934128.git.naveen.n.rao@linux.vnet.ibm.com>",""],"References":["<9e98f74834af349564b71bc8443bdad55d6e37c6.1505934128.git.naveen.n.rao@linux.vnet.ibm.com>",""],"X-TM-AS-MML":"disable","x-cbid":"17092209-1617-0000-0000-000002005F0A","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17092209-1618-0000-0000-0000484FDF7D","Message-Id":"","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-22_02:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=0\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1709220128","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.24","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"linuxppc-dev@lists.ozlabs.org, Masami Hiramatsu ,\n\tKamalesh Babulal ","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"Fix a circa 2005 FIXME by implementing a check to ensure that we\nactually got into the jprobe break handler() due to the trap in\njprobe_return().\n\nAcked-by: Masami Hiramatsu \nSigned-off-by: Naveen N. Rao \n---\n arch/powerpc/kernel/kprobes.c | 20 +++++++++-----------\n 1 file changed, 9 insertions(+), 11 deletions(-)","diff":"diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c\nindex 48a81614f629..a14c61855705 100644\n--- a/arch/powerpc/kernel/kprobes.c\n+++ b/arch/powerpc/kernel/kprobes.c\n@@ -639,24 +639,22 @@ NOKPROBE_SYMBOL(setjmp_pre_handler);\n \n void __used jprobe_return(void)\n {\n-\tasm volatile(\"trap\" ::: \"memory\");\n+\tasm volatile(\"jprobe_return_trap:\\n\"\n+\t\t \"trap\\n\"\n+\t\t ::: \"memory\");\n }\n NOKPROBE_SYMBOL(jprobe_return);\n \n-static void __used jprobe_return_end(void)\n-{\n-}\n-NOKPROBE_SYMBOL(jprobe_return_end);\n-\n int longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)\n {\n \tstruct kprobe_ctlblk *kcb = get_kprobe_ctlblk();\n \n-\t/*\n-\t * FIXME - we should ideally be validating that we got here 'cos\n-\t * of the \"trap\" in jprobe_return() above, before restoring the\n-\t * saved regs...\n-\t */\n+\tif (regs->nip != ppc_kallsyms_lookup_name(\"jprobe_return_trap\")) {\n+\t\tpr_debug(\"longjmp_break_handler NIP (0x%lx) does not match jprobe_return_trap (0x%lx)\\n\",\n+\t\t\t\tregs->nip, ppc_kallsyms_lookup_name(\"jprobe_return_trap\"));\n+\t\treturn 0;\n+\t}\n+\n \tmemcpy(regs, &kcb->jprobe_saved_regs, sizeof(struct pt_regs));\n \t/* It's OK to start function graph tracing again */\n \tunpause_graph_tracing();\n","prefixes":["v2","6/6"]}