From patchwork Wed Apr 26 17:17:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 87916 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp400993vqo; Wed, 26 Apr 2023 10:25:44 -0700 (PDT) X-Google-Smtp-Source: AKy350agsVyLVVBtmfnQPkHuCzRcHlXPJn5SHJ0HDcRvrnlRF0KLHBOjDNZbvMyPe5uaKr4WQ+IK X-Received: by 2002:a05:6a20:2d23:b0:f1:c63a:f7fa with SMTP id g35-20020a056a202d2300b000f1c63af7famr24319598pzl.15.1682529944133; Wed, 26 Apr 2023 10:25:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682529944; cv=none; d=google.com; s=arc-20160816; b=ANckbTqLQFSRAhGASuvOqQHvG2N+7CL6+Bp9m1qzeBTklF3NWhdZxDgrf2A6P2W/ze 4fKvjsQHQbSCU9ufgPP4TWWHX+Wj8UILGqjD8TZYoV8og+b17jQws6XLfBEqfuXvCXRB EQlrKwV9kgnXt7TG9ellY5JImre2AZkdx8G/1lXSD6x3ygW/uYAVXfCj+GhzsZMbxJ9w xca1j+8RW99/+/zWQ8MTJCSiL/b/sPYyNaozrsWb45s268U12Kr0pkZykBC4I21YJjHj xa+YOOxepC2eSCu9MATpktbCnRRUiqOtSKjmeg466FTTI0xcaKhBsDN4nTalY7SFSCYA K7MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=0d/Ih+W5YoZVKOdzntQXckNm4hZcyTWWgzAHP81u5Bs=; b=hh+f58YNrl9QIu8pyktvaVjKlv2E6ZR+QycPARwDbuc6KwaXDQyboMktmJtzeDC5db 2jK8wHBF7QW/+AXT8NNvSCnFmifcWABwYY02i8rHtZyFMrGoVG8Iq9l9gFzNPcpYP2fi zZxALRce0uoZ4Bqkp1lPxZMA6gqBI5CcueeK1YJ6y7Ud5k8U5gi7VwNKhBF76jC72TgM wCfwdTJxnuNzQuxivDE2frHxjV5758yAGiluMDUtpwZGZ7/152O8XirIGEdUhly1rYMm xVj0VrUbhYimsUh59WO796aGudPbVNDTpHtYrl6n1XokIu/LF4ivsFdDe2DUvydVwihi 0Phg== 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 bk13-20020a056a02028d00b005192652814bsi16584165pgb.541.2023.04.26.10.25.27; Wed, 26 Apr 2023 10:25:44 -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 S234850AbjDZRSO (ORCPT + 99 others); Wed, 26 Apr 2023 13:18:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234727AbjDZRRx (ORCPT ); Wed, 26 Apr 2023 13:17:53 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7034F6A54 for ; Wed, 26 Apr 2023 10:17:52 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A31286370D for ; Wed, 26 Apr 2023 17:17:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17ED6C433A4; Wed, 26 Apr 2023 17:17:51 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1prim6-005KZr-0g; Wed, 26 Apr 2023 13:17:50 -0400 Message-ID: <20230426171750.028699848@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 26 Apr 2023 13:17:08 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Doug Cook , Beau Belgrave Subject: [for-next][PATCH 05/11] tracing/user_events: Ensure write index cannot be negative References: <20230426171703.202523909@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham 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?1764260518989107942?= X-GMAIL-MSGID: =?utf-8?q?1764260518989107942?= From: Beau Belgrave The write index indicates which event the data is for and accesses a per-file array. The index is passed by user processes during write() calls as the first 4 bytes. Ensure that it cannot be negative by returning -EINVAL to prevent out of bounds accesses. Update ftrace self-test to ensure this occurs properly. Link: https://lkml.kernel.org/r/20230425225107.8525-2-beaub@linux.microsoft.com Fixes: 7f5a08c79df3 ("user_events: Add minimal support for trace_event into ftrace") Reported-by: Doug Cook Signed-off-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_user.c | 3 +++ tools/testing/selftests/user_events/ftrace_test.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index eadb58a3efba..546d47a57520 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1824,6 +1824,9 @@ static ssize_t user_events_write_core(struct file *file, struct iov_iter *i) if (unlikely(copy_from_iter(&idx, sizeof(idx), i) != sizeof(idx))) return -EFAULT; + if (idx < 0) + return -EINVAL; + rcu_read_lock_sched(); refs = rcu_dereference_sched(info->refs); diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/testing/selftests/user_events/ftrace_test.c index aceafacfb126..91272f9d6fce 100644 --- a/tools/testing/selftests/user_events/ftrace_test.c +++ b/tools/testing/selftests/user_events/ftrace_test.c @@ -296,6 +296,11 @@ TEST_F(user, write_events) { ASSERT_NE(-1, writev(self->data_fd, (const struct iovec *)io, 3)); after = trace_bytes(); ASSERT_GT(after, before); + + /* Negative index should fail with EINVAL */ + reg.write_index = -1; + ASSERT_EQ(-1, writev(self->data_fd, (const struct iovec *)io, 3)); + ASSERT_EQ(EINVAL, errno); } TEST_F(user, write_fault) {