From patchwork Thu Jan 5 12:16:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 39493 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp271551wrt; Thu, 5 Jan 2023 04:18:24 -0800 (PST) X-Google-Smtp-Source: AMrXdXtrSxQB4WK7CaJHm7n38Cbo+lB31rfQaXD7myTPRKzObIeUyhYOUK3nx7hjYOybzMx0+ce8 X-Received: by 2002:a17:90b:905:b0:225:dfb6:e8a0 with SMTP id bo5-20020a17090b090500b00225dfb6e8a0mr43678280pjb.38.1672921103883; Thu, 05 Jan 2023 04:18:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672921103; cv=none; d=google.com; s=arc-20160816; b=OQFWSGfPsXIRhCrwBHUG3WuhHtLFjS8kHo3QsE6UI/7nmF9tuiJprnZHxr6FfrXszT EIkqbUTCXbCwok9WwIsqfpRRRW9xe9PhSWZy7mj/68ukjeGzDJZy4yJGlhn0PLdnjLpF Au5YVAQC2xh7JERP/cWw6i/PHKfqTJshkzYGhCfixkxtapimHU108SkehJJlG0XdWyng jpdURU2tk01zBMrF0Lvk28YlV8991OQ9m2n6M/aC/LSvIhNI5fs9HsehYvF+VYh48NNn SEsdTh3tZVYm5eDdkDL7IXSJ/BRsFpFDcpopsOT+6PAb6MeMcqZ52pvQZT73X+1pfQWZ 7qhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=kEyRcWCb9KFEBzGCrjjrvF45cpAGvOemNEZixEUTWkk=; b=MT8aJndsbfaeCULCTzg4X54panrRZJZuZDuTlsFIEWS5BaNpke1z2vX7TohBSMujyJ n9O+5jwD4OVdpOJU2jpIT1bTfk+cA8inJOeRa55XaQ4NhUlQk+H0qw6xyuFxxiT0+Pmo 9I0qM5DF6PgOvwKxod7ssx7dQEbAgK96Cc3sEsOl/MMautbk8MzAUvUTgFVt75BxEv5D vvVs0dQ4BgJTXfUFKWBb6V+A4CMe4/8QVnzhYeBTKtv8qk69Y127XoYxICia+zajmslS FVk/GIyKm1XL7wwojVxb1X2AyvSjTIJ8xDU/CeSfZTBQNbqIkfVVyL6UMQOpCSLmH1FN mFog== 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=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mw17-20020a17090b4d1100b0022662665627si2096491pjb.32.2023.01.05.04.18.10; Thu, 05 Jan 2023 04:18:23 -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=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231326AbjAEMQh (ORCPT + 99 others); Thu, 5 Jan 2023 07:16:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231869AbjAEMQ1 (ORCPT ); Thu, 5 Jan 2023 07:16:27 -0500 Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70F6C44C5B; Thu, 5 Jan 2023 04:16:24 -0800 (PST) Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4NnlnK6gRTz501Qw; Thu, 5 Jan 2023 20:16:21 +0800 (CST) Received: from szxlzmapp01.zte.com.cn ([10.5.231.85]) by mse-fl2.zte.com.cn with SMTP id 305CGAi6064280; Thu, 5 Jan 2023 20:16:10 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp01[null]) by mapi (Zmail) with MAPI id mid14; Thu, 5 Jan 2023 20:16:13 +0800 (CST) Date: Thu, 5 Jan 2023 20:16:13 +0800 (CST) X-Zmail-TransId: 2b0363b6bf8dffffffffd846a38d X-Mailer: Zmail v1.0 Message-ID: <202301052016131375697@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , Subject: =?utf-8?q?=5BPATCH_linux-next=5D_blktrace=3A_use_strscpy=28=29_to_i?= =?utf-8?q?nstead_of_strncpy=28=29?= X-MAIL: mse-fl2.zte.com.cn 305CGAi6064280 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.251.13.novalocal with ID 63B6BF95.000 by FangMail milter! X-FangMail-Envelope: 1672920981/4NnlnK6gRTz501Qw/63B6BF95.000/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63B6BF95.000/4NnlnK6gRTz501Qw X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY 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?1754184919377900784?= X-GMAIL-MSGID: =?utf-8?q?1754184919377900784?= From: Xu Panda The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL-terminated strings. Signed-off-by: Xu Panda Signed-off-by: Yang Yang --- kernel/trace/blktrace.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 918a7d12df8f..ff0cc68d7667 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -524,8 +524,7 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, if (!buts->buf_size || !buts->buf_nr) return -EINVAL; - strncpy(buts->name, name, BLKTRACE_BDEV_SIZE); - buts->name[BLKTRACE_BDEV_SIZE - 1] = '\0'; + strscpy(buts->name, name, BLKTRACE_BDEV_SIZE); /* * some device names have larger paths - convert the slashes