Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757305AbbGGMwk (ORCPT ); Tue, 7 Jul 2015 08:52:40 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:38687 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754495AbbGGMwb (ORCPT ); Tue, 7 Jul 2015 08:52:31 -0400 Date: Tue, 7 Jul 2015 14:52:27 +0200 From: Anton Arapov To: Oleg Nesterov Cc: Ananth Mavinakayanahalli , David Long , Denys Vlasenko , "Frank Ch. Eigler" , Ingo Molnar , Jan Willeke , Jim Keniston , Mark Wielaard , Pratyush Anand , Srikar Dronamraju , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 04/11] uprobes: Change prepare_uretprobe() to use uprobe_warn() Message-ID: <20150707125227.GD5946@troglodyte.intinfra.com> References: <20150707012210.GA7466@redhat.com> <20150707012247.GA7514@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150707012247.GA7514@redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2065 Lines: 65 On Tue, Jul 07, 2015 at 03:22:47AM +0200, Oleg Nesterov wrote: > 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 > Acked-by: Srikar Dronamraju Acked-by: Anton Arapov > --- > 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/