From patchwork Thu Dec 20 17:08:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin King X-Patchwork-Id: 10739195 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 59F526C2 for ; Thu, 20 Dec 2018 17:08:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41B1428DE6 for ; Thu, 20 Dec 2018 17:08:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 34760290D8; Thu, 20 Dec 2018 17:08:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3DDA28DE6 for ; Thu, 20 Dec 2018 17:08:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387614AbeLTRIN (ORCPT ); Thu, 20 Dec 2018 12:08:13 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:60392 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731469AbeLTRIK (ORCPT ); Thu, 20 Dec 2018 12:08:10 -0500 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1ga1np-0007z9-OL; Thu, 20 Dec 2018 17:08:05 +0000 From: Colin King To: James Smart , Dick Kennedy , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][next] scsi: lpfc: replace snprintf with strscpy Date: Thu, 20 Dec 2018 17:08:05 +0000 Message-Id: <20181220170805.17802-1-colin.king@canonical.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Colin Ian King Using snprintf without a format specifier is potentially risky if the string phba->ModelDesc contains format specifiers. Replace this with the safer and more efficient strscpy. Cleans up clang warning: drivers/scsi/lpfc/lpfc_scsi.c:4543:31: warning: format string is not a string literal (potentially insecure) [-Wformat-security] Fixes: 5021267af132 ("scsi: lpfc: Adding ability to reset chip via pci bus reset") Signed-off-by: Colin Ian King --- drivers/scsi/lpfc/lpfc_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index b4f1a840b3b4..7b0cce3b42ed 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -4540,7 +4540,7 @@ lpfc_info(struct Scsi_Host *host) memset(lpfcinfobuf, 0, sizeof(lpfcinfobuf)); if (phba && phba->pcidev){ /* Model Description */ - scnprintf(tmp, sizeof(tmp), phba->ModelDesc); + strscpy(tmp, phba->ModelDesc, sizeof(tmp)); if (strlcat(lpfcinfobuf, tmp, sizeof(lpfcinfobuf)) >= sizeof(lpfcinfobuf)) goto buffer_done;