From patchwork Fri Dec 23 02:39:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 36081 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp101779wrn; Thu, 22 Dec 2022 18:41:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXuU9IycBVxPgzXXrdHbFTTWMLWhTzFA9RvYAdDcdtTzECGQeTnf7WUCAhANBxMJK5a0MSjY X-Received: by 2002:a17:906:9693:b0:7c0:e989:bf70 with SMTP id w19-20020a170906969300b007c0e989bf70mr5883493ejx.25.1671763288740; Thu, 22 Dec 2022 18:41:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671763288; cv=none; d=google.com; s=arc-20160816; b=VtlqMAAOxTyx4xOPWmfcEvbwwXkjtmN1lz8Ctjx4HxDjM9an2TQCE7AjNivdT1hIW+ LpbhjbZaim4UpxDzUln7x+9zHVWd4wNG6tVoJiRCfqSuBfyWnPDSlkUZTnEtmqvtbURf o9+W5TbvgxzSdzb1aGC6dvpiG4dduIjAx66Lk/Ur6LLeapIntL8VAdA+lb6THUEo5QAd hBf4kVti/tB5y9pr4j0JvY6rgThW1CenZC4Y6+y+oirG9J9xca5o0VaSnp2Rzax8eTuH 3kMnA60tjxKAB9b6oMDdr3q6JVgmhtacQ7/4HtI9x5X+Avoddu3MN3zxyoudXrDVSwIz fHrg== 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=zLtT/QwjyP16Ie87DJ7T4HSh5tXcuV0bAsv+RbL6Se4=; b=0UZVbFA4zzZ5o+qQ3Cx4WxHDlY7SU8kTifFIc95OSW+AKkJc7WlTXsayWTZYv1IGYr Zd1wF8ddpR4zv10hkfUjz/SKCMblYc8OA1yjmbKTb1a+C0xi+p036mPBb2ZiVjhpB5xc lqSjzg74atHmsscMr2m6DmLq+2PmV/XqoIDcNC8iJSn4+bDbfhWZ5Q4hwnY1ATZrzruu pEt0auttb6etTVas00ToH2jiasOUGXdYU1F62ocpij6MwWFdOuepQ3lQ1MdPK7G3V7Aq AWDvTXKqwcpwhGrsS/Ga/ieNxDvZPShRP5PNguJ0oQMy4wBYnKLxFjV2/bpo2iDI53BT YI9Q== 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 l22-20020a170906795600b0078d459a1ce9si1840959ejo.693.2022.12.22.18.41.05; Thu, 22 Dec 2022 18:41:28 -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 S235782AbiLWCj1 (ORCPT + 99 others); Thu, 22 Dec 2022 21:39:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235711AbiLWCjZ (ORCPT ); Thu, 22 Dec 2022 21:39:25 -0500 Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C2AD1928A; Thu, 22 Dec 2022 18:39:22 -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 4NdWbW5qJkz4y3ZH; Fri, 23 Dec 2022 10:39:19 +0800 (CST) Received: from szxlzmapp07.zte.com.cn ([10.5.230.251]) by mse-fl2.zte.com.cn with SMTP id 2BN2dBSU049421; Fri, 23 Dec 2022 10:39:11 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp02[null]) by mapi (Zmail) with MAPI id mid14; Fri, 23 Dec 2022 10:39:12 +0800 (CST) Date: Fri, 23 Dec 2022 10:39:12 +0800 (CST) X-Zmail-TransId: 2b0463a514d02fd8a3f9 X-Mailer: Zmail v1.0 Message-ID: <202212231039128402297@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , Subject: =?utf-8?q?=5BPATCH_linux-next=5D_of=3A_base=3A_use_strscpy=28=29_to?= =?utf-8?q?_instead_of_strncpy=28=29?= X-MAIL: mse-fl2.zte.com.cn 2BN2dBSU049421 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.251.13.novalocal with ID 63A514D7.001 by FangMail milter! X-FangMail-Envelope: 1671763159/4NdWbW5qJkz4y3ZH/63A514D7.001/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63A514D7.001/4NdWbW5qJkz4y3ZH 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?1752970862386606541?= X-GMAIL-MSGID: =?utf-8?q?1752970862386606541?= 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 --- drivers/of/base.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index d5a5c35eba72..ac6fde53342f 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1884,8 +1884,7 @@ static void of_alias_add(struct alias_prop *ap, struct device_node *np, { ap->np = np; ap->id = id; - strncpy(ap->stem, stem, stem_len); - ap->stem[stem_len] = 0; + strscpy(ap->stem, stem, stem_len + 1); list_add_tail(&ap->link, &aliases_lookup); pr_debug("adding DT alias:%s: stem=%s id=%i node=%pOF\n", ap->alias, ap->stem, ap->id, np);