From patchwork Tue Apr 11 21:17:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beau Belgrave X-Patchwork-Id: 82197 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2869341vqo; Tue, 11 Apr 2023 14:35:37 -0700 (PDT) X-Google-Smtp-Source: AKy350bQDwkYYupA6V4HdAWKPFwjHdz6D7l6vvzU0+EdCtwGJr879VE7AK3xfMbB2kAEiQBZ9bne X-Received: by 2002:a17:90b:4c50:b0:246:938d:db55 with SMTP id np16-20020a17090b4c5000b00246938ddb55mr12021898pjb.13.1681248937031; Tue, 11 Apr 2023 14:35:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681248937; cv=none; d=google.com; s=arc-20160816; b=gbfNhFB2djIrgbqObMM1OZ3lH9cpdjvXXpy0cr/7AnZpXrtzTP0H0eiD2V/388ztlG gZnMUDSJZKsdvt20k58JaOQa7UBbYVPW5ZQe/oqor+uILfgMbJ5MBM2kyhSdDaEem6vk JlPfGsNfIHRYcJY0uJaIPLXGl4+KzEReI4nHk68dxWY0A3bDtpljlwzC6dKTx2+CdBML fKl2x4Ndv2WRN78YZh56pYtxhRKEZr8e6VRi+7l/ms1tzRSMI6u94iO6wEJFfe3ld9Vy zAM2RbLNGjimrBUm57Nbjn3MARN1pucjIqrP3L3gFN5CSMkYIxBVwbQe9RPlgs6lNlMP Yr/Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=9bQADjcnzfitEajWNwld8GIEX6pWZSTccoW5aErnhjg=; b=b9d0MyadIXWbiPMuUwBsJNJgarhXjbWTqpBd8AqHEHLZjiJAdDeZRA+LwdUtO3fj8/ AKgik4vcEXAGWzrFWinvrXDMhkZG/e9hQqGw4xXGhulD+0QWgXdX6rUqGPwCF8HNtcF/ GSGMNavc+gwNUwoWc7YuFLhnAvdt/6Lx2IcbjJKFVSNci9tnXCrsHrEz64b5o7dezxQG zZt56keX6bLfj+t/0Yr9pcdpK0xBP9ub+zoO+kf7d19rpavPBAcslBgl8356gwdC4tIX YP7qpyarYd3TeaG/oTl5TBTPyX5Kj0us5MSU8c1HyE+NwpXAQ9zWxCx/MWPeL8gEc9yH qH/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=hLTVNCA0; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lp13-20020a17090b4a8d00b0023a30502979si96626pjb.155.2023.04.11.14.35.25; Tue, 11 Apr 2023 14:35:37 -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; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=hLTVNCA0; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229766AbjDKVRR (ORCPT + 99 others); Tue, 11 Apr 2023 17:17:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229737AbjDKVRQ (ORCPT ); Tue, 11 Apr 2023 17:17:16 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A42EC40E4; Tue, 11 Apr 2023 14:17:15 -0700 (PDT) Received: from W11-BEAU-MD.localdomain (unknown [76.135.27.212]) by linux.microsoft.com (Postfix) with ESMTPSA id 13A5621779A4; Tue, 11 Apr 2023 14:17:15 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 13A5621779A4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1681247835; bh=9bQADjcnzfitEajWNwld8GIEX6pWZSTccoW5aErnhjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hLTVNCA0O8jYUr2YSxF7S20EZevHhSS/9dTrPFg2hvlFJ6IEAxWhdsbjTUrcmFZi1 EUgVH9kuhoHibBtrQzPGme+e6qWp3lmCw/a8oYGfoklkDlj7Szay0ZntAjeiFhgL4r QeFOE0accT+P5qSlSSj0/HMouLXnC+EqOEoEOlk8= From: Beau Belgrave To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, dcook@linux.microsoft.com, alanau@linux.microsoft.com Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH 1/3] tracing/user_events: Ensure write index cannot be negative Date: Tue, 11 Apr 2023 14:17:07 -0700 Message-Id: <20230411211709.15018-2-beaub@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230411211709.15018-1-beaub@linux.microsoft.com> References: <20230411211709.15018-1-beaub@linux.microsoft.com> MIME-Version: 1.0 X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL 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?1762917285806820258?= X-GMAIL-MSGID: =?utf-8?q?1762917285806820258?= 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. Fixes: 7f5a08c79df3 ("user_events: Add minimal support for trace_event into ftrace") Reported-by: Doug Cook Signed-off-by: Beau Belgrave Acked-by: Masami Hiramatsu (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 cc8c6d8b69b5..e7dff24aa724 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1821,6 +1821,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) {