From patchwork Tue Sep 11 19:22:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 10596219 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 A93E414F9 for ; Tue, 11 Sep 2018 19:22:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3B7229D0D for ; Tue, 11 Sep 2018 19:22:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 980D429D1A; Tue, 11 Sep 2018 19:22:48 +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=unavailable 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 5834929D0D for ; Tue, 11 Sep 2018 19:22:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728081AbeILAXU (ORCPT ); Tue, 11 Sep 2018 20:23:20 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:45133 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727679AbeILAXT (ORCPT ); Tue, 11 Sep 2018 20:23:19 -0400 Received: by mail-qk1-f195.google.com with SMTP id z125-v6so17512655qkb.12 for ; Tue, 11 Sep 2018 12:22:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ta5tHOBMbSYoicbu0+CPW7rTPB5krKblxPmZPIYaX7A=; b=YQ8AxLvEIrAAMqLFBpShWEHzy5hQJe2NZzZe9IuxxOidvMEtg2FTnFLB8/e7xla9LT 2pzFpA9ayV1J2beos/RaKrVI/rIeq92+XbvPvqkIzMD+tAIW3o1LKLkLVTdP9XxQZeMG GYavsPERwLz/VEAvNCui2wlGBsJvtOBZBvAzEwEjVbFSgIeKszTOOI/xvIe191U0GYmK phDpHgBKEO7rHUluEgW7w1E57gptVZ+++SFWHrlvBebUzmuArhPDaakLE6x3QCwgdYUX rEhj6hJZJt5Rmr8ch+G330f4ex1cteyDa7dzrUmdgSZ2wdFFnCRx++AGLYZWsQkQjn23 Tjkw== X-Gm-Message-State: APzg51DoEe4p0VdJ7EDZEGBc6KNATafWsa3aOHOeU1YyLoCiKUEAPMAH nFRBZPA4XJWx/fXsHxqe0pc9Vw== X-Google-Smtp-Source: ANB0VdbmpoEGoSSuxumh2RAvcCGh6GccWKxp2YlXEHXHyh9qfMagyf4N92ahnEwbGZGN8jZL68aJmg== X-Received: by 2002:a37:1414:: with SMTP id e20-v6mr19562943qkh.88.1536693754793; Tue, 11 Sep 2018 12:22:34 -0700 (PDT) Received: from labbott-redhat.redhat.com ([2601:602:9802:a8dc::42c3]) by smtp.gmail.com with ESMTPSA id g14-v6sm13639452qtc.66.2018.09.11.12.22.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Sep 2018 12:22:33 -0700 (PDT) From: Laura Abbott To: "Bryant G. Ly" , Michael Cyr , Kees Cook Cc: Laura Abbott , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCHv3 1/2] scsi: ibmvscsis: Fix a stringop-overflow warning Date: Tue, 11 Sep 2018 12:22:25 -0700 Message-Id: <20180911192226.3620-2-labbott@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180911192226.3620-1-labbott@redhat.com> References: <20180911192226.3620-1-labbott@redhat.com> 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 There's currently a warning about string overflow with strncat: drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c: In function 'ibmvscsis_probe': drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:3479:2: error: 'strncat' specified bound 64 equals destination size [-Werror=stringop-overflow=] strncat(vscsi->eye, vdev->name, MAX_EYE); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Switch to a single snprintf instead of a strcpy + strcat to handle this cleanly. Signed-off-by: Laura Abbott Reviewed-by: Bryant G. Ly bly@catalogicsoftware.com --- v3: Make sure there is an extra space in the partition name --- drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c index fac377320158..b3a029ad07cd 100644 --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c @@ -3474,8 +3474,7 @@ static int ibmvscsis_probe(struct vio_dev *vdev, vscsi->dds.window[LOCAL].liobn, vscsi->dds.window[REMOTE].liobn); - strcpy(vscsi->eye, "VSCSI "); - strncat(vscsi->eye, vdev->name, MAX_EYE); + snprintf(vscsi->eye, sizeof(vscsi->eye), "VSCSI %s", vdev->name); vscsi->dds.unit_id = vdev->unit_address; strncpy(vscsi->dds.partition_name, partition_name,