From patchwork Wed Jul 5 14:40:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 116206 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1942075vqx; Wed, 5 Jul 2023 08:19:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlF2wIMYjc2psN7AjVRw3VRSuGIHQPosKwbhFUW1vBeCsyQNYjxznhv1C/ml/FEZLUpc7dyD X-Received: by 2002:a17:902:a518:b0:1b8:9958:e14b with SMTP id s24-20020a170902a51800b001b89958e14bmr5960312plq.10.1688570368271; Wed, 05 Jul 2023 08:19:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688570368; cv=none; d=google.com; s=arc-20160816; b=UBRxxxQ/2P+6hU2TzYEwtf/7YYQn1f9Ev8QoePtnWujd5+BBjstcRuItvDZSMvyhPB rU5IU/LjJnVCgtY7ddTnyWQi16lAgYpWHxr/Cy3EXfP31qABZ5+5eOBEJ33DOWNhx1Pn BicR/Szgx6Vp3lMw47PsbZFmQF4OvF65pCDnypYwLqXsYi+am3fXr16TI9pOUeJURqnm Rp96+4BNS039l8WvACe3myElOGdnbv16FPi6O6yunRmPWZN5W5v5qzhrbGJbl1xK/Ode ddUNyVghzWVtOlU+6xTzRbarVLFFWBMxg2BRQX2Td0kPPnvFf8FjB24pdWy+ZzsOSigK Sa9Q== 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=IJRwYplMq5Fm8Uc7UgjBy5V87RIPeDeeLT/0ygumdMw=; fh=X2mZDLcldxhaK9MSc+dq10Uj1WAEP/8G0M1cmQXYUVc=; b=QadUkK6HDvTvDotckXylPilxGgK5qkFgaWo5szBcGIGGgsqmiNokITVuKu7Soz8LKD Bl4VLCCvitwqEHlae6oAAuqJLWMRccAQ3UWrQtSHDIG6vljJ7wxqlcX8e1bR4SHPESU0 lh8U0kAu0Y54VfW2y7xgwctCtZUTCmm5oDv7RShv1pwHl/fmyqLMUEiPrPgGblKZtMZk tH0pjQgkY83aA9pBhZYMqCvV56bhOpmVouFrOFosd5hkzjqVK71zxBkuagIAflyhb0+N ZTK4wthkMwJyD7mxOwJT5cE7dde19Gr4+NZL0181dDPa3grZbWQqSZN1qU3zRv33oYWz wmKw== 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 t6-20020a1709027fc600b0019e57f5a5aesi507531plb.567.2023.07.05.08.19.13; Wed, 05 Jul 2023 08:19:28 -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 S232538AbjGEOqi (ORCPT + 99 others); Wed, 5 Jul 2023 10:46:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232113AbjGEOqf (ORCPT ); Wed, 5 Jul 2023 10:46:35 -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 3D96F1B6; Wed, 5 Jul 2023 07:46:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 98FB8612B1; Wed, 5 Jul 2023 14:46:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DA7BC433C9; Wed, 5 Jul 2023 14:46:32 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qH3m4-003Pgs-0D; Wed, 05 Jul 2023 10:46:32 -0400 Message-ID: <20230705144631.880308757@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 05 Jul 2023 10:40:32 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , stable@vger.kernel.org, Mateusz Stachyra Subject: [for-linus][PATCH 1/3] tracing: Fix null pointer dereference in tracing_err_log_open() References: <20230705144031.702796304@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?1770594362585811185?= X-GMAIL-MSGID: =?utf-8?q?1770594362585811185?= From: Mateusz Stachyra Fix an issue in function 'tracing_err_log_open'. The function doesn't call 'seq_open' if the file is opened only with write permissions, which results in 'file->private_data' being left as null. If we then use 'lseek' on that opened file, 'seq_lseek' dereferences 'file->private_data' in 'mutex_lock(&m->lock)', resulting in a kernel panic. Writing to this node requires root privileges, therefore this bug has very little security impact. Tracefs node: /sys/kernel/tracing/error_log Example Kernel panic: Unable to handle kernel NULL pointer dereference at virtual address 0000000000000038 Call trace: mutex_lock+0x30/0x110 seq_lseek+0x34/0xb8 __arm64_sys_lseek+0x6c/0xb8 invoke_syscall+0x58/0x13c el0_svc_common+0xc4/0x10c do_el0_svc+0x24/0x98 el0_svc+0x24/0x88 el0t_64_sync_handler+0x84/0xe4 el0t_64_sync+0x1b4/0x1b8 Code: d503201f aa0803e0 aa1f03e1 aa0103e9 (c8e97d02) ---[ end trace 561d1b49c12cf8a5 ]--- Kernel panic - not syncing: Oops: Fatal exception Link: https://lore.kernel.org/linux-trace-kernel/20230703155237eucms1p4dfb6a19caa14c79eb6c823d127b39024@eucms1p4 Link: https://lore.kernel.org/linux-trace-kernel/20230704102706eucms1p30d7ecdcc287f46ad67679fc8491b2e0f@eucms1p3 Cc: stable@vger.kernel.org Fixes: 8a062902be725 ("tracing: Add tracing error log") Signed-off-by: Mateusz Stachyra Suggested-by: Steven Rostedt Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 64a4dde073ef..3d34e6fea6b2 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -8135,7 +8135,7 @@ static const struct file_operations tracing_err_log_fops = { .open = tracing_err_log_open, .write = tracing_err_log_write, .read = seq_read, - .llseek = seq_lseek, + .llseek = tracing_lseek, .release = tracing_err_log_release, }; From patchwork Wed Jul 5 14:40:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 116190 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1923816vqx; Wed, 5 Jul 2023 07:54:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlEQML30JEtXiKAx+4icV8q+2PvvqHIQLFSFkZtQAaFRd9nTY2cMKyRgNjHNdzMBoIMo3SNv X-Received: by 2002:a17:902:a415:b0:1b7:ecbb:aa06 with SMTP id p21-20020a170902a41500b001b7ecbbaa06mr15592636plq.55.1688568851416; Wed, 05 Jul 2023 07:54:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688568851; cv=none; d=google.com; s=arc-20160816; b=w6TprMnHlOWTYqle4Y6ugPb2dwCqQ5MYqwAV9/DLQxyWiJtm+6LF0cVBdH/+mRBwvB yVGuGrblOKz5uUR4g4RFriBl/LKW9v6FUkfPFugQuTnVVRrUB6uCANkUMmjucn2nDuYT 12pjzY4TPT/AbidbIMCiVRE8XR4NACec8WAcSpCTmZqTofU1D8xmNOEbnckCCDUrWlxw RGVGbSxV5j2jhzwtA0bJLSbozK/j2PGGP2EJO4WaynuW6No6/Alg/efFJpEbCW7u4WCx EnYAcVSkk4ii7liM85F3ZJVP+agcpGAtGZMIDvHZWAI0ZgiFlK+qrxoNdhpI4G2e/yL4 igjg== 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=8wpr7HWYjC8QKsOYfU4kvQ4F8bosRCT9nVrMUCuOVlw=; fh=YYQeeErKdDfoDbUJLtwTGBvCGZPYow4/G5oV2k01wRA=; b=JS5uYk4l8kjC2g6h281MK7IS2MkAcQ0G5SkSiOfB2FcJdHcqpCQagOBlcye+3SC7kq tBuS9GOfFBXZX+PYcJCbM6PWBNeBMCL0/mx4w792+HZIU7XvfSa0SOLAw91RLfUJfUUp no3qGoiXrbQBKDzrUd9aKev6fjbcBReQIppNgcPDbgP0uv9Y9yb87tKFOQcYoGVnjYtd 5tJcNCJ/qkaXzJsT9hV+PTeOZMRInkrN2pzpMb6vinmvnp4dwQqr3k2GPOQIo7CDfm4C Buu78UIY1gn8po2EdKyFygcpxahthX54mkExBHcddS9/msQ3r3QA7S8dG6Vwn671nMpu zXwA== 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 jf15-20020a170903268f00b001b89eefc9fbsi5182440plb.262.2023.07.05.07.53.58; Wed, 05 Jul 2023 07:54:11 -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 S232693AbjGEOqp (ORCPT + 99 others); Wed, 5 Jul 2023 10:46:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232214AbjGEOqg (ORCPT ); Wed, 5 Jul 2023 10:46:36 -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 6A8F610CF for ; Wed, 5 Jul 2023 07:46:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D2090615D5 for ; Wed, 5 Jul 2023 14:46:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40570C433CC; Wed, 5 Jul 2023 14:46:33 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qH3m4-003Phk-0s; Wed, 05 Jul 2023 10:46:32 -0400 Message-ID: <20230705144632.086008297@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 05 Jul 2023 10:40:33 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Will Deacon , Donglin Peng , Arnd Bergmann , Florent Revest , Randy Dunlap , Catalin Marinas Subject: [for-linus][PATCH 2/3] arm64: ftrace: fix build error with CONFIG_FUNCTION_GRAPH_TRACER=n References: <20230705144031.702796304@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?1770592771771776766?= X-GMAIL-MSGID: =?utf-8?q?1770592771771776766?= From: Arnd Bergmann It appears that a merge conflict ended up hiding a newly added constant in some configurations: arch/arm64/kernel/entry-ftrace.S: Assembler messages: arch/arm64/kernel/entry-ftrace.S:59: Error: undefined symbol FTRACE_OPS_DIRECT_CALL used as an immediate value FTRACE_OPS_DIRECT_CALL is still used when CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS is enabled, even if CONFIG_FUNCTION_GRAPH_TRACER is disabled, so change the ifdef accordingly. Link: https://lkml.kernel.org/r/20230623152204.2216297-1-arnd@kernel.org Cc: Will Deacon Cc: Mark Rutland Cc: Donglin Peng Fixes: 3646970322464 ("arm64: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL") Signed-off-by: Arnd Bergmann Acked-by: Florent Revest Reviewed-by: Randy Dunlap Tested-by: Randy Dunlap # build-tested Acked-by: Catalin Marinas Signed-off-by: Steven Rostedt (Google) --- arch/arm64/kernel/asm-offsets.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index 757d01a68ffd..5ff1942b04fc 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -213,9 +213,9 @@ int main(void) DEFINE(FGRET_REGS_X7, offsetof(struct fgraph_ret_regs, regs[7])); DEFINE(FGRET_REGS_FP, offsetof(struct fgraph_ret_regs, fp)); DEFINE(FGRET_REGS_SIZE, sizeof(struct fgraph_ret_regs)); +#endif #ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS DEFINE(FTRACE_OPS_DIRECT_CALL, offsetof(struct ftrace_ops, direct_call)); -#endif #endif return 0; } From patchwork Wed Jul 5 14:40:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 116188 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1923193vqx; Wed, 5 Jul 2023 07:53:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlF8IPw5xiKgEk7njm3mUG/VzUccEw7ESqtpCYVk5AFzEHbuMpxuVqkW9HZ2/Q7Gm9XZW0dO X-Received: by 2002:a92:d905:0:b0:345:bace:9ea4 with SMTP id s5-20020a92d905000000b00345bace9ea4mr14967698iln.31.1688568780262; Wed, 05 Jul 2023 07:53:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688568780; cv=none; d=google.com; s=arc-20160816; b=HrWeI14rOf+tb7McAGl9LJpexRchFGqTOlYUgonTIEI78slku36y+tHO+lqBRo/4+N 1XYY6i4JX8HC3GFhLrDgXVJrqrss+0IE7DJrBdOusHx1BNMOHkgtExZlmEkeJwNj7Lmg HlTc5SdnAyMK1RXmsVSFtiE+NRWRZokM0kVT8jq8ggBFmWRcNOJDrklrurA0GLba3EXp L7tPS81hnjAdwkEzezPdSzFRsw7dfz1LnH4e+pHTpzFU7Qj7SQ9m8O2ikwI+k2D93GKY lzoMNMZCw3vLLpqJIluKjxq04zN+OYCtSIKgdeV2F0RKIRcL6Td12eiQFMcVONwctTAN we3A== 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=21NyYpvlfaiP4fEDclKVI3RrXE0tGf8gLd00eIoTBo0=; fh=5BSBmjZOSGypY3Wn22FExHU7oK6GR4W2PILq9NMOdfs=; b=e+hgwGvkK194dpREb7tWaUnvAYJpU8IPOsWTZScooOYgufihrkP/FGrzm0alBgB2CZ to9D6Mfg5uTtG8hNMM03cMeinxrCLFZRdpAo5ZlABW45B0vFkTE0T3+k0LytmwMJyd4t 2a3F55izsiZlGXbsQfR3ve9IOMmmYWazxpwh44Oc2/ZdLEO61fXpAX2uhy6l/8MCJjnY z0W47kcT3Jc4htUNH9NUrNHSr2B8a3ofyfTFFO+e+IAeziVlQkht/uDDpX3zAEnKEhav w64Fr7Ih4YOl5ZYC+CXXiXX1GtGiMf5OSkWM4RuebU8lYtG5oT7UVQ6s91M1Vc2CPqzE C1fQ== 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 a7-20020a634d07000000b00543e36736d3si24057192pgb.628.2023.07.05.07.52.46; Wed, 05 Jul 2023 07:53:00 -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 S232677AbjGEOqn (ORCPT + 99 others); Wed, 5 Jul 2023 10:46:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232244AbjGEOqg (ORCPT ); Wed, 5 Jul 2023 10:46:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BEDF10D5 for ; Wed, 5 Jul 2023 07:46:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EB66F615C9 for ; Wed, 5 Jul 2023 14:46:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D96BC433C8; Wed, 5 Jul 2023 14:46:33 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qH3m4-003PiJ-1Y; Wed, 05 Jul 2023 10:46:32 -0400 Message-ID: <20230705144632.294731621@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 05 Jul 2023 10:40:34 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Azeem Shaikh , Kees Cook Subject: [for-linus][PATCH 3/3] tracing/boot: Test strscpy() against less than zero for error References: <20230705144031.702796304@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,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?1770592696914195605?= X-GMAIL-MSGID: =?utf-8?q?1770592696914195605?= From: "Steven Rostedt (Google)" Instead of checking for -E2BIG, it is better to just check for less than zero of strscpy() for error. Testing for -E2BIG is not very robust, and the calling code does not really care about the error code, just that there was an error. One of the updates to convert strlcpy() to strscpy() had a v2 version that changed the test from testing against -E2BIG to less than zero, but I took the v1 version that still tested for -E2BIG. Link: https://lore.kernel.org/linux-trace-kernel/20230615180420.400769-1-azeemshaikh38@gmail.com/ Link: https://lore.kernel.org/linux-trace-kernel/20230704100807.707d1605@rorschach.local.home Cc: Mark Rutland Cc: Azeem Shaikh Cc: Kees Cook Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_boot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c index 5fe525f1b8cc..7ccc7a8e155b 100644 --- a/kernel/trace/trace_boot.c +++ b/kernel/trace/trace_boot.c @@ -31,7 +31,7 @@ trace_boot_set_instance_options(struct trace_array *tr, struct xbc_node *node) /* Common ftrace options */ xbc_node_for_each_array_value(node, "options", anode, p) { - if (strscpy(buf, p, ARRAY_SIZE(buf)) == -E2BIG) { + if (strscpy(buf, p, ARRAY_SIZE(buf)) < 0) { pr_err("String is too long: %s\n", p); continue; } @@ -87,7 +87,7 @@ trace_boot_enable_events(struct trace_array *tr, struct xbc_node *node) const char *p; xbc_node_for_each_array_value(node, "events", anode, p) { - if (strscpy(buf, p, ARRAY_SIZE(buf)) == -E2BIG) { + if (strscpy(buf, p, ARRAY_SIZE(buf)) < 0) { pr_err("String is too long: %s\n", p); continue; } @@ -486,7 +486,7 @@ trace_boot_init_one_event(struct trace_array *tr, struct xbc_node *gnode, p = xbc_node_find_value(enode, "filter", NULL); if (p && *p != '\0') { - if (strscpy(buf, p, ARRAY_SIZE(buf)) == -E2BIG) + if (strscpy(buf, p, ARRAY_SIZE(buf)) < 0) pr_err("filter string is too long: %s\n", p); else if (apply_event_filter(file, buf) < 0) pr_err("Failed to apply filter: %s\n", buf); @@ -494,7 +494,7 @@ trace_boot_init_one_event(struct trace_array *tr, struct xbc_node *gnode, if (IS_ENABLED(CONFIG_HIST_TRIGGERS)) { xbc_node_for_each_array_value(enode, "actions", anode, p) { - if (strscpy(buf, p, ARRAY_SIZE(buf)) == -E2BIG) + if (strscpy(buf, p, ARRAY_SIZE(buf)) < 0) pr_err("action string is too long: %s\n", p); else if (trigger_process_regex(file, buf) < 0) pr_err("Failed to apply an action: %s\n", p);