From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753371AbbGaN70 (ORCPT ); Fri, 31 Jul 2015 09:59:26 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57348 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751605AbbGaN7W (ORCPT ); Fri, 31 Jul 2015 09:59:22 -0400 Date: Fri, 31 Jul 2015 06:58:50 -0700 From: tip-bot for Oleg Nesterov Message-ID: Cc: srikar@linux.vnet.ibm.com, panand@redhat.com, mingo@kernel.org, tglx@linutronix.de, arapov@gmail.com, torvalds@linux-foundation.org, luto@amacapital.net, linux-kernel@vger.kernel.org, oleg@redhat.com, peterz@infradead.org, hpa@zytor.com Reply-To: arapov@gmail.com, tglx@linutronix.de, mingo@kernel.org, panand@redhat.com, srikar@linux.vnet.ibm.com, peterz@infradead.org, hpa@zytor.com, oleg@redhat.com, linux-kernel@vger.kernel.org, luto@amacapital.net, torvalds@linux-foundation.org In-Reply-To: <20150721134010.GA4752@redhat.com> References: <20150721134010.GA4752@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] uprobes: Change prepare_uretprobe() to use uprobe_warn() Git-Commit-ID: 6c58d0e4cc26ea8882928e64c0de9afed4fc37cb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6c58d0e4cc26ea8882928e64c0de9afed4fc37cb Gitweb: http://git.kernel.org/tip/6c58d0e4cc26ea8882928e64c0de9afed4fc37cb Author: Oleg Nesterov AuthorDate: Tue, 21 Jul 2015 15:40:10 +0200 Committer: Ingo Molnar CommitDate: Fri, 31 Jul 2015 10:38:04 +0200 uprobes: Change prepare_uretprobe() to use uprobe_warn() 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 Tested-by: Pratyush Anand Signed-off-by: Oleg Nesterov Acked-by: Srikar Dronamraju Acked-by: Anton Arapov Cc: Andy Lutomirski Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20150721134010.GA4752@redhat.com Signed-off-by: Ingo Molnar --- kernel/events/uprobes.c | 10 +++------- 1 file 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); }