[v2,2/2] tracing: kprobe: Fix potential null-ptr-deref on trace_array in kprobe_event_gen_test_exit()
Message ID | 20221108015130.28326-3-shangxiaojing@huawei.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2429198wru; Mon, 7 Nov 2022 18:12:22 -0800 (PST) X-Google-Smtp-Source: AMsMyM5lrJfmcd3ofFFxoquMCfGKpFq3AMIVZv20/ARG9mdnemChZYqzqWYl0rjeUe7zlt5q3Ib9 X-Received: by 2002:a17:90a:8c7:b0:214:e1:cad0 with SMTP id 7-20020a17090a08c700b0021400e1cad0mr40590460pjn.3.1667873542163; Mon, 07 Nov 2022 18:12:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667873542; cv=none; d=google.com; s=arc-20160816; b=SrECRNNUJNFpSZmBW4A277gOk5dBCI+kXIl68FEbcPJ0wDivdSuuBV6nL1PXHv4BN1 YvaGvVjKFoPL9pqWpIoZez0TW7Isb0sySeUSJlG8ZG+yRWwgxQv3werAjDG/Q7IG9T4+ jDV6P0CdtTt0wzPPr8YM3ASYQZkwiY8vYkzyLuPTwY1uaOx8wGlC2hINgd1e6uIiaJRn P+AmcDzspWeVnEJmHSqwAYDLPvm3mNageOnjIu3ztn4kdZOa0Jzo6ubANxY0OQ11Am84 ZgQBM+s5lt7qJVHBhzU1G8tuhtgBZ9aQ5bkgcH03wIWR0FNGcNsvQZtKaRZgeF4Y+GA6 OrjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=5hjTFC9GQDcpOxfpY9beEq/yUANuGBm6agqquXZX4RE=; b=vd5QmN3jCiYG+/lCf5XV6T+IP5LZ8jsfD+08BfOGeQ185U/ZGzPBJERgoEdF3KzfqS DH/HV1C7bIK6Gmxj6hpyP4vBqKqZpRFIkM0CNr/fYU1M94mgX6ezUMyZ2VKbBtwJ2UQ4 Kdnj4dvrwqik6mUxsR0QKjQ0NB+aWaATiDJSqOrlqdFuoVznmHHJzj3+I7PsxO/4G/zE 5Bg/RYCxIQ92TQnoF5FMsdvL3+ArKTRRhuiHLXVtSNpbXzbOEfGVWU5/wM00z3EpuwPB itbd8fRghCR2TM4rSKJ3OLcXvevWpJfA/ffFzYtOeq/x1Y84iGQXlAuugUhkt3wa0aiJ InfA== 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 j12-20020a63cf0c000000b0046ebcc1c65bsi12737229pgg.739.2022.11.07.18.12.04; Mon, 07 Nov 2022 18:12:22 -0800 (PST) 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 S233512AbiKHBw5 (ORCPT <rfc822;hjfbswb@gmail.com> + 99 others); Mon, 7 Nov 2022 20:52:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233464AbiKHBwx (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 7 Nov 2022 20:52:53 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29F7D1F2EC for <linux-kernel@vger.kernel.org>; Mon, 7 Nov 2022 17:52:52 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N5rhR0ksTzmVlY; Tue, 8 Nov 2022 09:52:39 +0800 (CST) Received: from huawei.com (10.175.100.227) by kwepemi500016.china.huawei.com (7.221.188.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 8 Nov 2022 09:52:49 +0800 From: Shang XiaoJing <shangxiaojing@huawei.com> To: <rostedt@goodmis.org>, <mhiramat@kernel.org>, <zanussi@kernel.org>, <linux-kernel@vger.kernel.org> CC: <shangxiaojing@huawei.com> Subject: [PATCH v2 2/2] tracing: kprobe: Fix potential null-ptr-deref on trace_array in kprobe_event_gen_test_exit() Date: Tue, 8 Nov 2022 09:51:30 +0800 Message-ID: <20221108015130.28326-3-shangxiaojing@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221108015130.28326-1-shangxiaojing@huawei.com> References: <20221108015130.28326-1-shangxiaojing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.100.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemi500016.china.huawei.com (7.221.188.220) 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748892167711626549?= X-GMAIL-MSGID: =?utf-8?q?1748892167711626549?= |
Series |
tracing: kprobe: Fix some bug in kprobe_event_gen_test.c
|
|
Commit Message
Shang XiaoJing
Nov. 8, 2022, 1:51 a.m. UTC
When test_gen_kprobe_cmd() failed after kprobe_event_gen_cmd_end(), it
will goto delete, which will call kprobe_event_delete() and release the
corresponding resource. However, the trace_array in gen_kretprobe_test
will point to the invalid resource. Set gen_kretprobe_test to NULL
after called kprobe_event_delete() to prevent null-ptr-deref.
BUG: kernel NULL pointer dereference, address: 0000000000000070
PGD 0 P4D 0
Oops: 0000 [#1] SMP PTI
CPU: 0 PID: 246 Comm: modprobe Tainted: G W
6.1.0-rc1-00174-g9522dc5c87da-dirty #248
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS
rel-1.15.0-0-g2dd4b9b3f840-prebuilt.qemu.org 04/01/2014
RIP: 0010:__ftrace_set_clr_event_nolock+0x53/0x1b0
Code: e8 82 26 fc ff 49 8b 1e c7 44 24 0c ea ff ff ff 49 39 de 0f 84 3c
01 00 00 c7 44 24 18 00 00 00 00 e8 61 26 fc ff 48 8b 6b 10 <44> 8b 65
70 4c 8b 6d 18 41 f7 c4 00 02 00 00 75 2f
RSP: 0018:ffffc9000159fe00 EFLAGS: 00010293
RAX: 0000000000000000 RBX: ffff88810971d268 RCX: 0000000000000000
RDX: ffff8881080be600 RSI: ffffffff811b48ff RDI: ffff88810971d058
RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000001
R10: ffffc9000159fe58 R11: 0000000000000001 R12: ffffffffa0001064
R13: ffffffffa000106c R14: ffff88810971d238 R15: 0000000000000000
FS: 00007f89eeff6540(0000) GS:ffff88813b600000(0000)
knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000000070 CR3: 000000010599e004 CR4: 0000000000330ef0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
__ftrace_set_clr_event+0x3e/0x60
trace_array_set_clr_event+0x35/0x50
? 0xffffffffa0000000
kprobe_event_gen_test_exit+0xcd/0x10b [kprobe_event_gen_test]
__x64_sys_delete_module+0x206/0x380
? lockdep_hardirqs_on_prepare+0xd8/0x190
? syscall_enter_from_user_mode+0x1c/0x50
do_syscall_64+0x3f/0x90
entry_SYSCALL_64_after_hwframe+0x63/0xcd
RIP: 0033:0x7f89eeb061b7
Fixes: 64836248dda2 ("tracing: Add kprobe event command generation test module")
Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
Cc: stable@vger.kernel.org
---
changes in v2:
- add cc tag to stable@vger.kernel.org.
- set gen_kprobe_test to NULL instead of gen_kprobe_test->tr, so as
gen_kretprobe_test.
---
kernel/trace/kprobe_event_gen_test.c | 4 ++++
1 file changed, 4 insertions(+)
Comments
On Tue, 8 Nov 2022 09:51:30 +0800 Shang XiaoJing <shangxiaojing@huawei.com> wrote: > When test_gen_kprobe_cmd() failed after kprobe_event_gen_cmd_end(), it > will goto delete, which will call kprobe_event_delete() and release the > corresponding resource. However, the trace_array in gen_kretprobe_test > will point to the invalid resource. Set gen_kretprobe_test to NULL > after called kprobe_event_delete() to prevent null-ptr-deref. > > BUG: kernel NULL pointer dereference, address: 0000000000000070 > PGD 0 P4D 0 > Oops: 0000 [#1] SMP PTI > CPU: 0 PID: 246 Comm: modprobe Tainted: G W > 6.1.0-rc1-00174-g9522dc5c87da-dirty #248 > Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS > rel-1.15.0-0-g2dd4b9b3f840-prebuilt.qemu.org 04/01/2014 > RIP: 0010:__ftrace_set_clr_event_nolock+0x53/0x1b0 > Code: e8 82 26 fc ff 49 8b 1e c7 44 24 0c ea ff ff ff 49 39 de 0f 84 3c > 01 00 00 c7 44 24 18 00 00 00 00 e8 61 26 fc ff 48 8b 6b 10 <44> 8b 65 > 70 4c 8b 6d 18 41 f7 c4 00 02 00 00 75 2f > RSP: 0018:ffffc9000159fe00 EFLAGS: 00010293 > RAX: 0000000000000000 RBX: ffff88810971d268 RCX: 0000000000000000 > RDX: ffff8881080be600 RSI: ffffffff811b48ff RDI: ffff88810971d058 > RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000001 > R10: ffffc9000159fe58 R11: 0000000000000001 R12: ffffffffa0001064 > R13: ffffffffa000106c R14: ffff88810971d238 R15: 0000000000000000 > FS: 00007f89eeff6540(0000) GS:ffff88813b600000(0000) > knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 0000000000000070 CR3: 000000010599e004 CR4: 0000000000330ef0 > DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 > Call Trace: > <TASK> > __ftrace_set_clr_event+0x3e/0x60 > trace_array_set_clr_event+0x35/0x50 > ? 0xffffffffa0000000 > kprobe_event_gen_test_exit+0xcd/0x10b [kprobe_event_gen_test] > __x64_sys_delete_module+0x206/0x380 > ? lockdep_hardirqs_on_prepare+0xd8/0x190 > ? syscall_enter_from_user_mode+0x1c/0x50 > do_syscall_64+0x3f/0x90 > entry_SYSCALL_64_after_hwframe+0x63/0xcd > RIP: 0033:0x7f89eeb061b7 > > Fixes: 64836248dda2 ("tracing: Add kprobe event command generation test module") > Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com> This looks good to me. Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Thank you! > Cc: stable@vger.kernel.org > --- > changes in v2: > - add cc tag to stable@vger.kernel.org. > - set gen_kprobe_test to NULL instead of gen_kprobe_test->tr, so as > gen_kretprobe_test. > --- > kernel/trace/kprobe_event_gen_test.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/kernel/trace/kprobe_event_gen_test.c b/kernel/trace/kprobe_event_gen_test.c > index 1c98fafcf333..c736487fc0e4 100644 > --- a/kernel/trace/kprobe_event_gen_test.c > +++ b/kernel/trace/kprobe_event_gen_test.c > @@ -143,6 +143,8 @@ static int __init test_gen_kprobe_cmd(void) > kfree(buf); > return ret; > delete: > + if (trace_event_file_is_valid(gen_kprobe_test)) > + gen_kprobe_test = NULL; > /* We got an error after creating the event, delete it */ > ret = kprobe_event_delete("gen_kprobe_test"); > goto out; > @@ -206,6 +208,8 @@ static int __init test_gen_kretprobe_cmd(void) > kfree(buf); > return ret; > delete: > + if (trace_event_file_is_valid(gen_kretprobe_test)) > + gen_kretprobe_test = NULL; > /* We got an error after creating the event, delete it */ > ret = kprobe_event_delete("gen_kretprobe_test"); > goto out; > -- > 2.17.1 >
On Tue, 8 Nov 2022 23:38:46 +0900 Masami Hiramatsu (Google) <mhiramat@kernel.org> wrote: > > Fixes: 64836248dda2 ("tracing: Add kprobe event command generation test module") > > Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com> > > This looks good to me. > > Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Hi Masami, Did you want me to pull these on top of your probes/urgent branch? I'm going through all my patches now and will be starting the testing hopefully later this week. -- Steve
On Wed, 16 Nov 2022 21:55:36 -0500 Steven Rostedt <rostedt@goodmis.org> wrote: > On Tue, 8 Nov 2022 23:38:46 +0900 > Masami Hiramatsu (Google) <mhiramat@kernel.org> wrote: > > > > Fixes: 64836248dda2 ("tracing: Add kprobe event command generation test module") > > > Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com> > > > > This looks good to me. > > > > Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> > > Hi Masami, > > Did you want me to pull these on top of your probes/urgent branch? No, I think these patches are already queued on probes/urgent :) https://kernel.googlesource.com/pub/scm/linux/kernel/git/trace/linux-trace.git/+/210880de4e3945d0ac028894df578063205bef61 > > I'm going through all my patches now and will be starting the testing > hopefully later this week. Thanks! > > -- Steve
On Thu, 17 Nov 2022 16:14:53 +0900 Masami Hiramatsu (Google) <mhiramat@kernel.org> wrote: > No, I think these patches are already queued on probes/urgent :) > > https://kernel.googlesource.com/pub/scm/linux/kernel/git/trace/linux-trace.git/+/210880de4e3945d0ac028894df578063205bef61 Bah, for some reason, when I searched the git log of that branch, it didn't show up :-/ -- Steve
diff --git a/kernel/trace/kprobe_event_gen_test.c b/kernel/trace/kprobe_event_gen_test.c index 1c98fafcf333..c736487fc0e4 100644 --- a/kernel/trace/kprobe_event_gen_test.c +++ b/kernel/trace/kprobe_event_gen_test.c @@ -143,6 +143,8 @@ static int __init test_gen_kprobe_cmd(void) kfree(buf); return ret; delete: + if (trace_event_file_is_valid(gen_kprobe_test)) + gen_kprobe_test = NULL; /* We got an error after creating the event, delete it */ ret = kprobe_event_delete("gen_kprobe_test"); goto out; @@ -206,6 +208,8 @@ static int __init test_gen_kretprobe_cmd(void) kfree(buf); return ret; delete: + if (trace_event_file_is_valid(gen_kretprobe_test)) + gen_kretprobe_test = NULL; /* We got an error after creating the event, delete it */ ret = kprobe_event_delete("gen_kretprobe_test"); goto out;