From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3216147-1523476368-2-4217309517700817278 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523476368; b=MLFs0sVp8Q1i2CFfGR9Xf/f5ZwzcixwfhNTefUxdT0n23PKOn6 cL0I+/tvAAmmWyX2IyMIVYMrrajooSlm7M8YIfkLayunCO3+aaJhg3VVxBFE0UdZ ibWHSkXNs6aYGXgZTnE5VJ2iB8BB6r4NX17uhAJxpVv9wXv3PAXiYYHIS8SofvPN A0cP6iPPVzbPJ6ON38Th54e9O7xiWGWDmQyznAIlOyUS8dZ26IRCB6jJs5o70auP AnkmcKnSgYOJ8LYHaBgdElC2I19aoOU7LG7S0TJiHvzABtavdogMf66/rWXT5xka CK3BlP3vTxD1MZIHqlSFw0+IlivrOYCdFUJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523476368; bh=4m2Z9faQJtWK40rzh+nb5sMLVLsp1a VvFyKrMGtU/Aw=; b=AZpIeZ2WbML/HP/b2hol2oFCZRxGNPVZEhxxyonjHfP9EA Vlm7no+kHnSCdZG3xn+AKEE6qmrZskKgBAc9LIfOs6bw9b8d0P/sErC3jh2vqx4v SzLKIvbrbLgUHCmSS/ANn0qXbp0ef9ta5pJ+ia3en82v9bzs/xx16t6p7mCfE9KM 2jLj3+YefjoH7PQ4L1InTvpb5jjApU1jQLvbnDTVKieoWtz7pDgvXYOwcTV8qc9u E9oxGfuTL8imSGsVW+2hN+adLLomF6Uy9TUXs4EnZLwmwoW/HPptS8EoP/LYEW76 Y/IqKDiAtvjkrlfaQ2MCGgdvIQFt8nVgCuhpCGJQ== ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfCc9TUOcCYOThxmHtQ6RcpuPmXpJXOpSU3gfFOOK+STv8n1gjnkg2GzugajEVnZ2cfrwrfDqSqc+B8/6vjK1COcloQNhDaq1hD+8C5iiaIJUNge0ZjAN Ig2Oiap29WTfbUkgFqrjXLpznieNVnI/p8kmwvqLSThylbYgOJs6lCbey7ZhbT/HiG7qxMjYne+1r3RRBAn/hKtIdFl08eKj/ViSkmZzgmHm1BnuU0y+OGkf X-CM-Analysis: v=2.3 cv=Tq3Iegfh c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=VwQbUJbxAAAA:8 a=20KFwNOVAAAA:8 a=VnNF1IyMAAAA:8 a=pGLkceISAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=XY9_J5gOtC_FUSJH_rwA:9 a=QEXdDO2ut3YA:10 a=AjGcO6oz07-iQ99wixmX:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754276AbeDKS6F (ORCPT ); Wed, 11 Apr 2018 14:58:05 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36522 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933250AbeDKS6D (ORCPT ); Wed, 11 Apr 2018 14:58:03 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnaldo Carvalho de Melo , Masami Hiramatsu , Ravi Bangoria , Thomas Richter , Paul Clarke , bhargavb , linux-rt-users@vger.kernel.org, Sasha Levin Subject: [PATCH 4.9 123/310] perf probe: Add warning message if there is unexpected event name Date: Wed, 11 Apr 2018 20:34:22 +0200 Message-Id: <20180411183627.497322322@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masami Hiramatsu [ Upstream commit 9f5c6d8777a2d962b0eeacb2a16f37da6bea545b ] This improve the error message so that user can know event-name error before writing new events to kprobe-events interface. E.g. ====== #./perf probe -x /lib64/libc-2.25.so malloc_get_state* Internal error: "malloc_get_state@GLIBC_2" is an invalid event name. Error: Failed to add events. ====== Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Masami Hiramatsu Acked-by: Ravi Bangoria Reviewed-by: Thomas Richter Tested-by: Arnaldo Carvalho de Melo Cc: Paul Clarke Cc: bhargavb Cc: linux-rt-users@vger.kernel.org Link: http://lkml.kernel.org/r/151275040665.24652.5188568529237584489.stgit@devbox Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/probe-event.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -2609,6 +2609,14 @@ static int get_new_event_name(char *buf, out: free(nbase); + + /* Final validation */ + if (ret >= 0 && !is_c_func_name(buf)) { + pr_warning("Internal error: \"%s\" is an invalid event name.\n", + buf); + ret = -EINVAL; + } + return ret; }