From patchwork Thu Nov 10 12:37:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 18110 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp123449wru; Thu, 10 Nov 2022 04:44:23 -0800 (PST) X-Google-Smtp-Source: AMsMyM4wdyQ7rzVVaXnp24fCnyLgtttZqhQ6GK0TlmX0LwXMr0tm8paaUc20rB9dwbHg63+SA8P5 X-Received: by 2002:a17:90b:4f4c:b0:216:cdf6:5c39 with SMTP id pj12-20020a17090b4f4c00b00216cdf65c39mr34834558pjb.237.1668084263233; Thu, 10 Nov 2022 04:44:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668084263; cv=none; d=google.com; s=arc-20160816; b=VML3gwl/vIy+FXFEDDL55Qy6yr4PCopE0PPckYsvFSxLbcKuL2DY5WVpg/J2OIXi79 pVS8hF3+sOYDRRrjdQgmgsugKaVADiPsompbp6lzt4t5q19lk5FC5cRgssa5clLRTlj4 5b+i0175JrLXMUIREzNZF3FnRMI4AUEvDyd9g8fo9vAD5syOpQzrP+xhg2j+pTFb3lI4 ypwWff6eAsqXd1DvHg1os8ZahcR/zwH1aZ/kntM1f6J8fdmkPjXJIbQSqEDOlIHYn3la AgeR/S2j6eWLPj7YXtsxXJB2DERtF8cQiWnNvgkwS/jSCX0PeEWAAxbE1eFZ2iV3IRJd +5BQ== 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=oLNI4aOwyukALiE2V5lSBIPKOHROlH7xgnRqYdEEqx8=; b=kcPgwBfVrt5IKVf34DCBGBCdpJd7efT22Aol6p3ImoIaUdOrxoYnyzptBfZinGlSjE Nd+iUeDVtjAxgJAAd6ezxhtI2c6nM3ATqfaEe71UBbSUc6Qrh0ULFWHC4m++Z1M1QoiQ LhDqdX/cC232hzUckOvQ2+CNYHL2DltttgLMdU1YB2tlMivUQg3zd0LwBzWqNYEFIl2w WlVmJu2YCcUH2+6ApG5WDlc/WtRh4NLAvuPvdMxl6kmNMQTw5ZZKsy0nuP6FiOhija+G l7oL2xI3ebUJsMiJnH6nWKH5p51bx6nq/OKCFPz9WxDKTDLlBoMTUONPZKhKFImdKuGA JvuQ== 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 2-20020a621902000000b0054ed3047ee2si18891701pfz.22.2022.11.10.04.44.07; Thu, 10 Nov 2022 04:44: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 S229777AbiKJMhr (ORCPT + 99 others); Thu, 10 Nov 2022 07:37:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbiKJMhp (ORCPT ); Thu, 10 Nov 2022 07:37:45 -0500 X-Greylist: delayed 217 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 10 Nov 2022 04:37:42 PST Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E0FB6BDE7; Thu, 10 Nov 2022 04:37:42 -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 4N7Lvn041Tz4y0tx; Thu, 10 Nov 2022 20:37:41 +0800 (CST) Received: from szxlzmapp06.zte.com.cn ([10.5.230.252]) by mse-fl1.zte.com.cn with SMTP id 2AACbWBI049553; Thu, 10 Nov 2022 20:37:32 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp03[null]) by mapi (Zmail) with MAPI id mid14; Thu, 10 Nov 2022 20:37:35 +0800 (CST) Date: Thu, 10 Nov 2022 20:37:35 +0800 (CST) X-Zmail-TransId: 2b05636cf08fffffffff92f28484 X-Mailer: Zmail v1.0 Message-ID: <202211102037359588718@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , Subject: =?utf-8?q?=5BPATCH_linux-next=5D_scsi=3A_qla2xxx=3A_use_strscpy=28?= =?utf-8?q?=29_is_more_robust_and_safer?= X-MAIL: mse-fl1.zte.com.cn 2AACbWBI049553 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.251.13.novalocal with ID 636CF095.000 by FangMail milter! X-FangMail-Envelope: 1668083861/4N7Lvn041Tz4y0tx/636CF095.000/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 636CF095.000/4N7Lvn041Tz4y0tx 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?1749113124259963576?= X-GMAIL-MSGID: =?utf-8?q?1749113124259963576?= From: Xu Panda The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL terminated strings. Reported-by: Zeal Robot Signed-off-by: Xu Panda Signed-off-by: Yang Yang --- drivers/scsi/qla2xxx/qla_init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index ce4c5d728407..7b3782a212c0 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -4843,7 +4843,7 @@ qla2x00_set_model_info(scsi_qla_host_t *vha, uint8_t *model, size_t len, if (use_tbl && ha->pdev->subsystem_vendor == PCI_VENDOR_ID_QLOGIC && index < QLA_MODEL_NAMES) - strlcpy(ha->model_desc, + strscpy(ha->model_desc, qla2x00_model_name[index * 2 + 1], sizeof(ha->model_desc)); } else { @@ -4851,14 +4851,14 @@ qla2x00_set_model_info(scsi_qla_host_t *vha, uint8_t *model, size_t len, if (use_tbl && ha->pdev->subsystem_vendor == PCI_VENDOR_ID_QLOGIC && index < QLA_MODEL_NAMES) { - strlcpy(ha->model_number, + strscpy(ha->model_number, qla2x00_model_name[index * 2], sizeof(ha->model_number)); - strlcpy(ha->model_desc, + strscpy(ha->model_desc, qla2x00_model_name[index * 2 + 1], sizeof(ha->model_desc)); } else { - strlcpy(ha->model_number, def, + strscpy(ha->model_number, def, sizeof(ha->model_number)); } }