From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB69FC5ACCC for ; Thu, 18 Oct 2018 13:12:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 842202145D for ; Thu, 18 Oct 2018 13:12:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="jyaZEq6n" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 842202145D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728183AbeJRVN4 (ORCPT ); Thu, 18 Oct 2018 17:13:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:53170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727493AbeJRVN4 (ORCPT ); Thu, 18 Oct 2018 17:13:56 -0400 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3F2C22145D; Thu, 18 Oct 2018 13:12:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1539868377; bh=aGpNWtxh8LOUXuStYGE6c2koF34lF6rvkmBGeAmLyoo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jyaZEq6nFWyLsN1kvavZV8DyffkvbfatUe3aE1lurBQ32d3XZk8mKNW71ClIghY1j vVQa3UXKeOT9oQWQIk5pk2n1wP0o+ZrlC0VdYQUaFcG0y31lejoxdtc73uJHo1SiyF 5dWvMu7mX0i9F8rBCRxflWkCixXXqIXPxGaR+f/s= From: Masami Hiramatsu To: Steven Rostedt , Shuah Khan Cc: Tom Zanussi , Masami Hiramatsu , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Tom Zanussi Subject: [PATCH v2 2/3] tracing: Fix synthetic event to allow semicolon at end Date: Thu, 18 Oct 2018 22:12:34 +0900 Message-Id: <153986835420.18251.2191216690677025744.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <153986829702.18251.1286066460999338772.stgit@devbox> References: <153986829702.18251.1286066460999338772.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix synthetic event to allow independent semicolon at end. The synthetic_events interface accepts a semicolon after the last word if there is no space. # echo "myevent u64 var;" >> synthetic_events But if there is a space, it returns an error. # echo "myevent u64 var ;" > synthetic_events sh: write error: Invalid argument This behavior is difficult for users to understand. Let's allow the last independent semicolon too. Fixes: commit 4b147936fa50 ("tracing: Add support for 'synthetic' events") Signed-off-by: Masami Hiramatsu Cc: stable@vger.kernel.org Cc: Tom Zanussi Cc: Steven Rostedt --- kernel/trace/trace_events_hist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 6ff83941065a..d239004aaf29 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -1088,7 +1088,7 @@ static int create_synth_event(int argc, char **argv) i += consumed - 1; } - if (i < argc) { + if (i < argc && strcmp(argv[i], ";") != 0) { ret = -EINVAL; goto err; }