From patchwork Sat Dec 3 06:24:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 29228 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1239857wrr; Fri, 2 Dec 2022 22:48:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Ty2JV7l50aX7M7a6y0v+V3F1RqzIDOwgVU3PHKVOZkQNQ8N5HE9BsEB1QSJ1Nxe2f6LdZ X-Received: by 2002:a17:903:26ce:b0:189:c267:19cc with SMTP id jg14-20020a17090326ce00b00189c26719ccmr4148537plb.101.1670050116567; Fri, 02 Dec 2022 22:48:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670050116; cv=none; d=google.com; s=arc-20160816; b=b17TtqaBoyd6Q0SJaqJGCYVsD3O+Hsrq3Z/E24bZx2uyQsEyNbn3REOInLgXCTp20I dPSr/p7HpLetb3E65vESJveVgsqbqmM5qnVQyOBlePyitDBFYQm+54NPYPmZlLIGnw/q TFgN5cHLiD3jB3uZGD70pmg+dVMAELY59Bo1JOFfVHMeeMmX4dxb7W+0ZLB7bqfPkf3Y ZAaN0/JZktL8cHZy3+rPOqzEFMnw9PhCETBAEfiziA8xbUVwNpPlWqN72uYUnG3SKuCV FlpVS1esNXv0ZJoqDB3Wb199u0vmy0nhVSS3KiVuWuZFLQ5BWlXHacJSMPS0XktcUvMr xUJA== 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=P2Twls+mt6cx3r0J7P83/ql7I+3JkigLFBFlKhQVmm8=; b=uzckKf+fDHvf3hjao3AQwR9mQbXDtrbF7x6vy5BBoapYm0P4V3Dwbfuhg70YNuhzoS H4AUOUqV13wgwU2owGb1j6J9g3lKcXROIlzdJ4B+/rir1/zdlPjbLogJv7xsGd53azwi D/6Ob+/J+wwypnHrpLtY3h0U4WFId1zP+vzuiXzBl4yC3pFU4I9UZpZ7qIT/N0beV6TY hmBAD6lOl7RZRT7hgmjHeHNhfcuejkEp3FKls1WOiimEQVUMqlfsTjwnbw/SIDFCgLcz ZKvSb1Uho7fvjGmNCEn+qKTORvXS8HI15gSv0DUhZVFtsxGi8UcWtDgDeeSwUKs0NxI0 aQeQ== 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 v17-20020aa799d1000000b005642ec3d8c5si8925084pfi.52.2022.12.02.22.48.24; Fri, 02 Dec 2022 22:48:36 -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 S231311AbiLCGYX (ORCPT + 99 others); Sat, 3 Dec 2022 01:24:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230414AbiLCGYV (ORCPT ); Sat, 3 Dec 2022 01:24:21 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EE61C23D2; Fri, 2 Dec 2022 22:24:20 -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 mxhk.zte.com.cn (FangMail) with ESMTPS id 4NPKXM0Jvqz5BNS0; Sat, 3 Dec 2022 14:24:19 +0800 (CST) Received: from szxlzmapp04.zte.com.cn ([10.5.231.166]) by mse-fl1.zte.com.cn with SMTP id 2B36OF6L089225; Sat, 3 Dec 2022 14:24:15 +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:24:17 +0800 (CST) Date: Sat, 3 Dec 2022 14:24:17 +0800 (CST) X-Zmail-TransId: 2b04638aeb9173903db7 X-Mailer: Zmail v1.0 Message-ID: <202212031424175433783@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , , , , , , , , Subject: =?utf-8?q?=5BPATCH_linux-next=5D_x86/platform/uv=3A_use_strscpy_to_?= =?utf-8?q?instead_of_strncpy=28=29?= X-MAIL: mse-fl1.zte.com.cn 2B36OF6L089225 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.138.novalocal with ID 638AEB93.000 by FangMail milter! X-FangMail-Envelope: 1670048659/4NPKXM0Jvqz5BNS0/638AEB93.000/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 638AEB93.000/4NPKXM0Jvqz5BNS0 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?1751174470852414676?= X-GMAIL-MSGID: =?utf-8?q?1751174470852414676?= 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 --- arch/x86/platform/uv/uv_nmi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c index a60af0230e27..1b0c8062c731 100644 --- a/arch/x86/platform/uv/uv_nmi.c +++ b/arch/x86/platform/uv/uv_nmi.c @@ -205,8 +205,7 @@ static int param_set_action(const char *val, const struct kernel_param *kp) char arg[ACTION_LEN], *p; /* (remove possible '\n') */ - strncpy(arg, val, ACTION_LEN - 1); - arg[ACTION_LEN - 1] = '\0'; + strscpy(arg, val, ACTION_LEN - 1); p = strchr(arg, '\n'); if (p) *p = '\0'; @@ -959,7 +958,7 @@ static int uv_handle_nmi(unsigned int reason, struct pt_regs *regs) /* Unexpected return, revert action to "dump" */ if (master) - strncpy(uv_nmi_action, "dump", strlen(uv_nmi_action)); + strscpy(uv_nmi_action, "dump", strlen(uv_nmi_action)); } /* Pause as all CPU's enter the NMI handler */