From patchwork Sat Dec 3 06:22:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 29229 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1239865wrr; Fri, 2 Dec 2022 22:48:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf6nudI1dmi3S8wrGL88OZfFzlZQ4JxvaYK26wjeXirgknW1JJRaib0PVWpzk/OoQj1V4xN8 X-Received: by 2002:a62:ea0e:0:b0:575:7bb:d6fc with SMTP id t14-20020a62ea0e000000b0057507bbd6fcmr32222243pfh.79.1670050118017; Fri, 02 Dec 2022 22:48:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670050118; cv=none; d=google.com; s=arc-20160816; b=ACGo4XLmghsO1u2N78eht5aWG4rmiUwLRxDL0On5opGEi70kW4TBuJelNquFy+z55q r6LWBw7n61ycxd/GpnQkzKbH2B4OHdSBHxZX5AkyC2w+IssCk+tauvyLrWaLw08txCvX 9+OHXAtMwJEvorTskTFFMukahPxeOrkTarj5PyLcm1pUmsuP8Gen/wQFgzaStnPpRayt bc7doz8CyxIOZ48G1HicNHXontxOjkJo0nVMhXMdEjpU1gRL2B597NBWdrm9+vBE1A68 qV7tygCpwAutvqi22ckWRZs064M1Qu50wEy+kz9QwwkAI6ls3t6BasFi+uvdrL2hOR6Q I/UA== 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=hW3Touci4d8DpRE1b0C69SFpEuGRTIz95uk9z4DFFl0=; b=o1n3Hs7frT5nQcBoPUjUw8Szvz0nKcPN1ZIOx8TE3HcbcP+3CYTym45azIlHBsipCu pxVmvDBBFACGwQ29yk+c6axjoUK3sN5cVQlacrlaK+nr/djM/WFw0lGPChdiFH/3iH1G 1Xz8v/3N4FEXWNbqsPsNg2ouB/rs/8yKbn9AgHmUfA660RswInCf3ANFGZqGS8tetQAw SGY3UncSy1+gNGquwyUbeQ6znt24RqSAwM/qTuyKgReslU51z9PLD8bsy2YQShU+sZlc z75SKUKBK7n7R+a6iAvvGGlTokBtRJLroT/+Azv6hYW9Zi0DNKnzwmyQokiD9hX142lA HoKg== 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 b21-20020a630c15000000b00434b19dc958si8843854pgl.349.2022.12.02.22.48.24; Fri, 02 Dec 2022 22:48:37 -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 S231281AbiLCGXJ (ORCPT + 99 others); Sat, 3 Dec 2022 01:23:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231264AbiLCGXF (ORCPT ); Sat, 3 Dec 2022 01:23:05 -0500 Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0918D77408; Fri, 2 Dec 2022 22:23:04 -0800 (PST) Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (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 4NPKVt4mFRz4y0vK; Sat, 3 Dec 2022 14:23:02 +0800 (CST) Received: from szxlzmapp01.zte.com.cn ([10.5.231.85]) by mse-fl1.zte.com.cn with SMTP id 2B36MuUB089118; Sat, 3 Dec 2022 14:22:56 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp02[null]) by mapi (Zmail) with MAPI id mid14; Sat, 3 Dec 2022 14:22:58 +0800 (CST) Date: Sat, 3 Dec 2022 14:22:58 +0800 (CST) X-Zmail-TransId: 2b04638aeb42ffffffff9bb0203b X-Mailer: Zmail v1.0 Message-ID: <202212031422587503771@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , Subject: =?utf-8?q?=5BPATCH_linux-next=5D_block=3A_use_strscpy=28=29_to_inst?= =?utf-8?q?ead_of_strncpy=28=29?= X-MAIL: mse-fl1.zte.com.cn 2B36MuUB089118 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.251.13.novalocal with ID 638AEB46.001 by FangMail milter! X-FangMail-Envelope: 1670048582/4NPKVt4mFRz4y0vK/638AEB46.001/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 638AEB46.001/4NPKVt4mFRz4y0vK 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?1751174472250072253?= X-GMAIL-MSGID: =?utf-8?q?1751174472250072253?= 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 --- block/partitions/cmdline.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/block/partitions/cmdline.c b/block/partitions/cmdline.c index 1af610f0ba8c..c03bc105e575 100644 --- a/block/partitions/cmdline.c +++ b/block/partitions/cmdline.c @@ -81,8 +81,7 @@ static int parse_subpart(struct cmdline_subpart **subpart, char *partdef) length = min_t(int, next - partdef, sizeof(new_subpart->name) - 1); - strncpy(new_subpart->name, partdef, length); - new_subpart->name[length] = '\0'; + strscpy(new_subpart->name, partdef, length); partdef = ++next; } else @@ -140,8 +139,7 @@ static int parse_parts(struct cmdline_parts **parts, const char *bdevdef) } length = min_t(int, next - bdevdef, sizeof(newparts->name) - 1); - strncpy(newparts->name, bdevdef, length); - newparts->name[length] = '\0'; + strscpy(newparts->name, bdevdef, length); newparts->nr_subparts = 0; next_subpart = &newparts->subpart; @@ -153,8 +151,7 @@ static int parse_parts(struct cmdline_parts **parts, const char *bdevdef) length = (!next) ? (sizeof(buf) - 1) : min_t(int, next - bdevdef, sizeof(buf) - 1); - strncpy(buf, bdevdef, length); - buf[length] = '\0'; + strscpy(buf, bdevdef, length); ret = parse_subpart(next_subpart, buf); if (ret) @@ -267,8 +264,7 @@ static int add_part(int slot, struct cmdline_subpart *subpart, label_min = min_t(int, sizeof(info->volname) - 1, sizeof(subpart->name)); - strncpy(info->volname, subpart->name, label_min); - info->volname[label_min] = '\0'; + strscpy(info->volname, subpart->name, label_min); snprintf(tmp, sizeof(tmp), "(%s)", info->volname); strlcat(state->pp_buf, tmp, PAGE_SIZE);