linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Oleg Nesterov <oleg@redhat.com>
To: Ananth Mavinakayanahalli <ananth@in.ibm.com>,
	Anton Arapov <arapov@gmail.com>,
	David Long <dave.long@linaro.org>,
	Denys Vlasenko <dvlasenk@redhat.com>,
	"Frank Ch. Eigler" <fche@redhat.com>,
	Ingo Molnar <mingo@kernel.org>, Jan Willeke <willeke@de.ibm.com>,
	Jim Keniston <jkenisto@us.ibm.com>,
	Mark Wielaard <mjw@redhat.com>,
	Pratyush Anand <panand@redhat.com>,
	Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH v2 04/11] uprobes: Change prepare_uretprobe() to use uprobe_warn()
Date: Tue, 7 Jul 2015 03:22:47 +0200	[thread overview]
Message-ID: <20150707012247.GA7514@redhat.com> (raw)
In-Reply-To: <20150707012210.GA7466@redhat.com>

Turn the last pr_warn() in uprobes.c into uprobe_warn().

While at it:

   - s/kzalloc/kmalloc, we initialize every member of ri

   - remove the pointless comment above the obvious code

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
---
 kernel/events/uprobes.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index eabdc21..4c941fe 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -1541,9 +1541,9 @@ static void prepare_uretprobe(struct uprobe *uprobe, struct pt_regs *regs)
 		return;
 	}
 
-	ri = kzalloc(sizeof(struct return_instance), GFP_KERNEL);
+	ri = kmalloc(sizeof(struct return_instance), GFP_KERNEL);
 	if (!ri)
-		goto fail;
+		return;
 
 	trampoline_vaddr = get_trampoline_vaddr();
 	orig_ret_vaddr = arch_uretprobe_hijack_return_addr(trampoline_vaddr, regs);
@@ -1561,8 +1561,7 @@ static void prepare_uretprobe(struct uprobe *uprobe, struct pt_regs *regs)
 			 * This situation is not possible. Likely we have an
 			 * attack from user-space.
 			 */
-			pr_warn("uprobe: unable to set uretprobe pid/tgid=%d/%d\n",
-						current->pid, current->tgid);
+			uprobe_warn(current, "handle tail call");
 			goto fail;
 		}
 
@@ -1576,13 +1575,10 @@ static void prepare_uretprobe(struct uprobe *uprobe, struct pt_regs *regs)
 	ri->chained = chained;
 
 	utask->depth++;
-
-	/* add instance to the stack */
 	ri->next = utask->return_instances;
 	utask->return_instances = ri;
 
 	return;
-
  fail:
 	kfree(ri);
 }
-- 
1.5.5.1


  parent reply	other threads:[~2015-07-07  1:24 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-07  1:22 [PATCH v2 00/11] uprobes: longjmp fixes Oleg Nesterov
2015-07-07  1:22 ` [PATCH v2 01/11] uprobes: Introduce get_uprobe() Oleg Nesterov
2015-07-07 12:44   ` Anton Arapov
2015-07-07  1:22 ` [PATCH v2 02/11] uprobes: Introduce free_ret_instance() Oleg Nesterov
2015-07-07 12:46   ` Anton Arapov
2015-07-07  1:22 ` [PATCH v2 03/11] uprobes: Send SIGILL if handle_trampoline() fails Oleg Nesterov
2015-07-07 12:51   ` Anton Arapov
2015-07-07  1:22 ` Oleg Nesterov [this message]
2015-07-07 12:52   ` [PATCH v2 04/11] uprobes: Change prepare_uretprobe() to use uprobe_warn() Anton Arapov
2015-07-07  1:22 ` [PATCH v2 05/11] uprobes: Change handle_trampoline() to find the next chain beforehand Oleg Nesterov
2015-07-07 12:54   ` Anton Arapov
2015-07-07  1:22 ` [PATCH v2 06/11] uprobes: Export struct return_instance, introduce arch_uretprobe_is_alive() Oleg Nesterov
2015-07-07 12:58   ` Anton Arapov
2015-07-10 11:52   ` Srikar Dronamraju
2015-07-07  1:22 ` [PATCH v2 07/11] uprobes/x86: Reimplement arch_uretprobe_is_alive() Oleg Nesterov
2015-07-07 13:02   ` Anton Arapov
2015-07-10 11:53   ` Srikar Dronamraju
2015-07-07  1:23 ` [PATCH v2 08/11] uprobes: Change handle_trampoline() to flush the frames invalidated by longjmp() Oleg Nesterov
2015-07-07 13:05   ` Anton Arapov
2015-07-10 11:55   ` Srikar Dronamraju
2015-07-07  1:23 ` [PATCH v2 09/11] uprobes: Change prepare_uretprobe() to (try to) flush the dead frames Oleg Nesterov
2015-07-07 13:07   ` Anton Arapov
2015-07-10 11:57   ` Srikar Dronamraju
2015-07-07  1:23 ` [PATCH v2 10/11] uprobes: Add the "enum rp_check ctx" arg to arch_uretprobe_is_alive() Oleg Nesterov
2015-07-07 13:08   ` Anton Arapov
2015-07-10 12:06   ` Srikar Dronamraju
2015-07-07  1:23 ` [PATCH v2 11/11] uprobes/x86: Make arch_uretprobe_is_alive(RP_CHECK_CALL) more clever Oleg Nesterov
2015-07-07 13:11   ` Anton Arapov
2015-07-10 12:07   ` Srikar Dronamraju
2015-07-10 12:01 ` [PATCH v2 00/11] uprobes: longjmp fixes Pratyush Anand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150707012247.GA7514@redhat.com \
    --to=oleg@redhat.com \
    --cc=ananth@in.ibm.com \
    --cc=arapov@gmail.com \
    --cc=dave.long@linaro.org \
    --cc=dvlasenk@redhat.com \
    --cc=fche@redhat.com \
    --cc=jkenisto@us.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mjw@redhat.com \
    --cc=panand@redhat.com \
    --cc=srikar@linux.vnet.ibm.com \
    --cc=willeke@de.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).