From patchwork Mon May 29 03:21:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sunliming X-Patchwork-Id: 99955 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1260324vqr; Sun, 28 May 2023 20:45:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6+i6C7UDwMS6W49GX1sV5tp+N6mv0qOoDUG5E0rbFKX1xm50P+Y9C0YVNvPrj0UAmTbAX1 X-Received: by 2002:a17:902:f686:b0:1ae:9105:10a5 with SMTP id l6-20020a170902f68600b001ae910510a5mr8750829plg.2.1685331934490; Sun, 28 May 2023 20:45:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685331934; cv=none; d=google.com; s=arc-20160816; b=XMNYSsen95IkDKeS1NM0ry2U2edv0PUoPwyPQ/jEKkdTF1SS+tVo2qhKWlqeQ8HKzM drO7vam0pwJ/5+L+LDKSBJ54u3uktYSwOxvmv9McwLYw1BC3b0dxJHAhRQr/iwTu+AUT sRMoUxHfIlfZXdWohR/0hJI9HFxe9dgEATV/j//ygf8IbtN2PRWSTZBma1JOK99sXllR OGAPSxE7G/xBu+Fha8zqZ2Jh2UmNshhz8mL0QH5Xe1eMTQNXZHeuyucrOLb4xsSi60LR 9v3EN+K+1NwpTaRQ1eG9UMaXbSU//wp8gRPZF/HlMsm/8JrjlLc9mo+evrvrur7rcij5 iA1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=4P7WeN5KQdMR5j63wqiGQQE4xifYy2/Pv0geGlldDZQ=; b=D4gWN2zRnDTFsyPRszlAyLS6uwkRB5XYreCEqxDQtfh6ImjPBd7ALG8tl66rjp93VX HRu1rxz7sCHUdwqqZC5k2rYmE4j57qKTi+rPo80spcZKVU+kIoyZNGpfGzKHMaHlCU2M zOaZ9p9tNXS/h/LCjUSrU9DDNIhNGnLN+NrMJoMpewIIIp9ZVn0X768Tw6LK2tYz4SRw traL6Hz6iZNDi05MxXdRIqkCDCphZsxYCfXKsDKu4GhIFtqtdXJrOkrMBWdDcA2SFHBY 6npNucdb+m/cG4e4TNp3IJCHbGvGLl5xORMQ1FgKe5axUPxJW8PKYUM8SfVHSEX9Ed2c nggw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e8-20020a17090301c800b001b03a1a3174si2066125plh.330.2023.05.28.20.45.20; Sun, 28 May 2023 20:45:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229570AbjE2DVM (ORCPT + 99 others); Sun, 28 May 2023 23:21:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229534AbjE2DVJ (ORCPT ); Sun, 28 May 2023 23:21:09 -0400 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C22B0B1; Sun, 28 May 2023 20:21:07 -0700 (PDT) Received: by mail-pl1-f193.google.com with SMTP id d9443c01a7336-1b0236ee816so12012445ad.1; Sun, 28 May 2023 20:21:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685330467; x=1687922467; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4P7WeN5KQdMR5j63wqiGQQE4xifYy2/Pv0geGlldDZQ=; b=QzkolDpQ5uDt7iU73UZg/FlNZquAtm2r+udHpCNRbvR7zb7KAKlzx0//H/j8hgVg5g GSryfiPSKcjdOUDhvVLw+Q/I1cbVA03VqxA7lfGh3L0HLsI8UiuHNVjhTcHQMA4zPDwV hCHjSMbN82NjZLOzhfgL+Ll/CoiNMtCWmrQlKx/7H8707z4wHkdKQr9XUCry45+Y4CFq od6dpGxzPfe2rIA1j4vSCSO8d6V4dzNhO0ANCWfvqNOYiWM3gkmYRuW7rOR/89JU0Iwn pi0diVZHrJapY6EWKDRsP9KV/ufiGs+4jtQqjz29eo4mmz1GRDGgouJZq51p6a8fm21x XcrA== X-Gm-Message-State: AC+VfDzMtu0pzNLn6iTNbicTZ1L4m4wXyMCN9fFm9+qq/wO399BLFNzY 4rwAVYZwg07tYts5iwM4ew== X-Received: by 2002:a17:903:18a:b0:1ad:e2b6:d2a0 with SMTP id z10-20020a170903018a00b001ade2b6d2a0mr7625869plg.11.1685330467048; Sun, 28 May 2023 20:21:07 -0700 (PDT) Received: from localhost.localdomain ([116.128.244.169]) by smtp.gmail.com with ESMTPSA id ik7-20020a170902ab0700b001b04772d33esm417634plb.165.2023.05.28.20.21.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 May 2023 20:21:06 -0700 (PDT) From: sunliming To: rostedt@goodmis.org, mhiramat@kernel.org, beaub@linux.microsoft.com Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, sunliming Subject: [PATCH V3] tracing/user_events: Prevent same name but different args event Date: Mon, 29 May 2023 11:21:00 +0800 Message-Id: <20230529032100.286534-1-sunliming@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767198618544883456?= X-GMAIL-MSGID: =?utf-8?q?1767198618544883456?= User processes register name_args for events. If the same name but different args event are registered. The trace outputs of second event are printed as the first event. This is incorrect. Return EADDRINUSE back to the user process if the same name but different args event has being registered. Signed-off-by: sunliming Reviewed-by: Masami Hiramatsu (Google) Acked-by: Beau Belgrave --- kernel/trace/trace_events_user.c | 36 +++++++++++++++---- .../selftests/user_events/ftrace_test.c | 6 ++++ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index b1ecd7677642..e90161294698 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1753,6 +1753,8 @@ static int user_event_parse(struct user_event_group *group, char *name, int ret; u32 key; struct user_event *user; + int argc = 0; + char **argv; /* Prevent dyn_event from racing */ mutex_lock(&event_mutex); @@ -1760,13 +1762,35 @@ static int user_event_parse(struct user_event_group *group, char *name, mutex_unlock(&event_mutex); if (user) { - *newuser = user; - /* - * Name is allocated by caller, free it since it already exists. - * Caller only worries about failure cases for freeing. - */ - kfree(name); + if (args) { + argv = argv_split(GFP_KERNEL, args, &argc); + if (!argv) { + ret = -ENOMEM; + goto error; + } + + ret = user_fields_match(user, argc, (const char **)argv); + argv_free(argv); + + } else + ret = list_empty(&user->fields); + + if (ret) { + *newuser = user; + /* + * Name is allocated by caller, free it since it already exists. + * Caller only worries about failure cases for freeing. + */ + kfree(name); + } else { + ret = -EADDRINUSE; + goto error; + } + return 0; +error: + refcount_dec(&user->refcnt); + return ret; } user = kzalloc(sizeof(*user), GFP_KERNEL_ACCOUNT); diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/testing/selftests/user_events/ftrace_test.c index 7c99cef94a65..6e8c4b47281c 100644 --- a/tools/testing/selftests/user_events/ftrace_test.c +++ b/tools/testing/selftests/user_events/ftrace_test.c @@ -228,6 +228,12 @@ TEST_F(user, register_events) { ASSERT_EQ(0, ioctl(self->data_fd, DIAG_IOCSREG, ®)); ASSERT_EQ(0, reg.write_index); + /* Multiple registers to same name but different args should fail */ + reg.enable_bit = 29; + reg.name_args = (__u64)"__test_event u32 field1;"; + ASSERT_EQ(-1, ioctl(self->data_fd, DIAG_IOCSREG, ®)); + ASSERT_EQ(EADDRINUSE, errno); + /* Ensure disabled */ self->enable_fd = open(enable_file, O_RDWR); ASSERT_NE(-1, self->enable_fd);