From patchwork Tue Mar 14 04:47:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 69286 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1568273wrd; Mon, 13 Mar 2023 22:03:07 -0700 (PDT) X-Google-Smtp-Source: AK7set8lruqBZjKBVsbTEWXRHGLvmX5c8pJ/mqlOf4UCnlX46lyG3D/a8afKa/Udy+eBe9Z5wL7s X-Received: by 2002:a05:6102:3909:b0:421:6364:7381 with SMTP id e9-20020a056102390900b0042163647381mr21053937vsu.24.1678770187275; Mon, 13 Mar 2023 22:03:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678770187; cv=none; d=google.com; s=arc-20160816; b=vMKmlT7haiS2xNtYQdVlNQ9CLNHFYUrrg9/Lml/c0x1FOxehEL6P8/xaQVpoSpqI06 Z5V+yC1sA2cRDgjStBuY4UT6L5sD4HCVEWoSKvH3CKPQzviEkvHCshRw1WIXqDOz4/xT N5XzUsoPP2OM7V4Fwy5p7D/kvWU5wl0odp6NyGfEeruokM2UPb040WcL5uXQRBH76kHo aVLQFpHXO89bllSLwzeE7N+XVycdeNjKJGJ4NlBtX/ssxL6FI6ooCPBkPuj6f72Xv9jG IBH/HkHUYDJgQB/HLKiifUj+QDKaZjm2Kjp5L5QFgOn3zzayIW6HwvmBit1k7zJaJdyn UmBg== 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:to:from; bh=UQqUKIT+8speRPY0FNHtxG6OpacmOWqhf7oie/WNr7k=; b=O1Jz77jYaMCIkkgU4gnQ+01SCoGT25/QZvgP+qcKZlxX2lgzdMDoyTxqLZ8ql+zrY+ KMc67m6BICz2qqxJtufLI77+l4f1lHM1Q6LE3RjxRS4rIJZhb8/nnF20ZjRS94+xpsiT TcN1flW1R1spP37LOpHRwitGznRbExPDi0omlnL/lHBmuei0UUUNmB41MiHfwHDiIO1X nlDKiWQA+tR6X8Yoo5XnDvrEGIvnW++0TyjnKl6iQnfbZH5oMuzRpXHg8nK5Eob9ilcD uAy3IEUQsKALAOsjtyjYMdVMgVPq/QzgKDD+z2l7rWzhqB3J5qE/oleXfWCw6uVB3MFe T7aw== 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d3-20020a67b603000000b0041404bc1b7bsi713575vsm.712.2023.03.13.22.02.52; Mon, 13 Mar 2023 22:03:07 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229689AbjCNEuh (ORCPT + 99 others); Tue, 14 Mar 2023 00:50:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229687AbjCNEuc (ORCPT ); Tue, 14 Mar 2023 00:50:32 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE39523DAB; Mon, 13 Mar 2023 21:50:29 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4PbLgB13VbzKmyT; Tue, 14 Mar 2023 12:50:14 +0800 (CST) Received: from localhost.localdomain (10.67.174.95) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Tue, 14 Mar 2023 12:50:26 +0800 From: Yang Jihong To: , , , , , , , , , , Subject: [PATCH] perf/core: Fix perf_output_begin parameter is incorrectly invoked in perf_event_bpf_output Date: Tue, 14 Mar 2023 04:47:35 +0000 Message-ID: <20230314044735.56551-1-yangjihong1@huawei.com> X-Mailer: git-send-email 2.30.GIT MIME-Version: 1.0 X-Originating-IP: [10.67.174.95] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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?1760318127858369268?= X-GMAIL-MSGID: =?utf-8?q?1760318127858369268?= syzkaller reportes a KASAN issue with stack-out-of-bounds. The call trace is as follows: dump_stack+0x9c/0xd3 print_address_description.constprop.0+0x19/0x170 __kasan_report.cold+0x6c/0x84 kasan_report+0x3a/0x50 __perf_event_header__init_id+0x34/0x290 perf_event_header__init_id+0x48/0x60 perf_output_begin+0x4a4/0x560 perf_event_bpf_output+0x161/0x1e0 perf_iterate_sb_cpu+0x29e/0x340 perf_iterate_sb+0x4c/0xc0 perf_event_bpf_event+0x194/0x2c0 __bpf_prog_put.constprop.0+0x55/0xf0 __cls_bpf_delete_prog+0xea/0x120 [cls_bpf] cls_bpf_delete_prog_work+0x1c/0x30 [cls_bpf] process_one_work+0x3c2/0x730 worker_thread+0x93/0x650 kthread+0x1b8/0x210 ret_from_fork+0x1f/0x30 commit 267fb27352b6 ("perf: Reduce stack usage of perf_output_begin()") use on-stack struct perf_sample_data of the caller function. However, perf_event_bpf_output uses incorrect parameter to convert small-sized data (struct perf_bpf_event) into large-sized data (struct perf_sample_data), which causes memory overwriting occurs in __perf_event_header__init_id. Fixes: 267fb27352b6 ("perf: Reduce stack usage of perf_output_begin()") Signed-off-by: Yang Jihong --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index f79fd8b87f75..296617edbda1 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9187,7 +9187,7 @@ static void perf_event_bpf_output(struct perf_event *event, void *data) perf_event_header__init_id(&bpf_event->event_id.header, &sample, event); - ret = perf_output_begin(&handle, data, event, + ret = perf_output_begin(&handle, &sample, event, bpf_event->event_id.header.size); if (ret) return;