From nobody Thu Sep 18 16:02:13 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D660C4321E for ; Mon, 5 Dec 2022 11:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230484AbiLELd7 (ORCPT ); Mon, 5 Dec 2022 06:33:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230110AbiLELd4 (ORCPT ); Mon, 5 Dec 2022 06:33:56 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 070EE6367 for ; Mon, 5 Dec 2022 03:33:56 -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 mxhk.zte.com.cn (FangMail) with ESMTPS id 4NQhJf5HRvz5BNRf; Mon, 5 Dec 2022 19:33:54 +0800 (CST) Received: from szxlzmapp06.zte.com.cn ([10.5.230.252]) by mse-fl2.zte.com.cn with SMTP id 2B5BXmkP074067; Mon, 5 Dec 2022 19:33:48 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp02[null]) by mapi (Zmail) with MAPI id mid14; Mon, 5 Dec 2022 19:33:50 +0800 (CST) Date: Mon, 5 Dec 2022 19:33:50 +0800 (CST) X-Zmail-TransId: 2b04638dd71e1939a789 X-Mailer: Zmail v1.0 Message-ID: <202212051933509509270@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , Subject: =?UTF-8?B?W1BBVENIIGxpbnV4LW5leHRdIGJ1czogZnNsLW1jOiB1c2Ugc3Ryc2NweSgpIHRvIGluc3RlYWQgb2Ygc3RybmNweSgp?= X-MAIL: mse-fl2.zte.com.cn 2B5BXmkP074067 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.138.novalocal with ID 638DD722.000 by FangMail milter! X-FangMail-Envelope: 1670240034/4NQhJf5HRvz5BNRf/638DD722.000/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 638DD722.000/4NQhJf5HRvz5BNRf Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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/bus/fsl-mc/dprc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/bus/fsl-mc/dprc.c b/drivers/bus/fsl-mc/dprc.c index d129338b8bc0..d095d1e044e7 100644 --- a/drivers/bus/fsl-mc/dprc.c +++ b/drivers/bus/fsl-mc/dprc.c @@ -450,10 +450,8 @@ int dprc_get_obj(struct fsl_mc_io *mc_io, obj_desc->ver_major =3D le16_to_cpu(rsp_params->version_major); obj_desc->ver_minor =3D le16_to_cpu(rsp_params->version_minor); obj_desc->flags =3D le16_to_cpu(rsp_params->flags); - strncpy(obj_desc->type, rsp_params->type, 16); - obj_desc->type[15] =3D '\0'; - strncpy(obj_desc->label, rsp_params->label, 16); - obj_desc->label[15] =3D '\0'; + strscpy(obj_desc->type, rsp_params->type, 16); + strscpy(obj_desc->label, rsp_params->label, 16); return 0; } EXPORT_SYMBOL_GPL(dprc_get_obj); @@ -491,8 +489,7 @@ int dprc_set_obj_irq(struct fsl_mc_io *mc_io, cmd_params->irq_addr =3D cpu_to_le64(irq_cfg->paddr); cmd_params->irq_num =3D cpu_to_le32(irq_cfg->irq_num); cmd_params->obj_id =3D cpu_to_le32(obj_id); - strncpy(cmd_params->obj_type, obj_type, 16); - cmd_params->obj_type[15] =3D '\0'; + strscpy(cmd_params->obj_type, obj_type, 16); /* send command to mc*/ return mc_send_command(mc_io, &cmd); @@ -564,8 +561,7 @@ int dprc_get_obj_region(struct fsl_mc_io *mc_io, cmd_params =3D (struct dprc_cmd_get_obj_region *)cmd.params; cmd_params->obj_id =3D cpu_to_le32(obj_id); cmd_params->region_index =3D region_index; - strncpy(cmd_params->obj_type, obj_type, 16); - cmd_params->obj_type[15] =3D '\0'; + strscpy(cmd_params->obj_type, obj_type, 16); /* send command to mc*/ err =3D mc_send_command(mc_io, &cmd); --=20 2.15.2