From patchwork Tue Sep 11 19:22:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 10596215 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 4B43A14BD for ; Tue, 11 Sep 2018 19:22:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46E2729D20 for ; Tue, 11 Sep 2018 19:22:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B51D29D25; Tue, 11 Sep 2018 19:22:45 +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 EF92E29D11 for ; Tue, 11 Sep 2018 19:22:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728159AbeILAXW (ORCPT ); Tue, 11 Sep 2018 20:23:22 -0400 Received: from mail-qt0-f196.google.com ([209.85.216.196]:41748 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727648AbeILAXV (ORCPT ); Tue, 11 Sep 2018 20:23:21 -0400 Received: by mail-qt0-f196.google.com with SMTP id t39-v6so29466498qtc.8 for ; Tue, 11 Sep 2018 12:22:37 -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=IYDLXOvqXi5U1MpjfZDRh4TELVkjnKkN4SnOhEmKxyU=; b=nqGrpTGcJsHdbhbpO0nm1Uk7rBIKzS3gKODL+GTpAgVsd49mZ2zqwbnsKkb84GP2lk GsGoJ7Ah0EN9XjvRAxE22lV1XhOiXP+tWpdJ89rYD/WLbN/gZpmxy+1aFJ6v3q/GQh2j NnvAQwMX5CZbR2xiERHodWP2gwMhVyy/GIAiy0gsKjHbZN4qWkN+Cn/38cOPUSUm/+Ef Zy5eTwVaN27F/F1/NWqvsv6RZDpJHafNzm61cr+YbkxxkSagIciZXQ8KR94lbAqWn2pD GmCRIMQUgq5DBuNLNsb+76uwmDRDaQxNCXCx92ofivzTWVaoy6NgpdoRVBeIuVfp8tF4 TDuQ== X-Gm-Message-State: APzg51D0POy0t8N5sZFwUpXM4eFPr7tXi/2m65d2mTiTAwpqjZuky2WW 1eh3aSaS9+q3Nw4wmKjxf+r+3A== X-Google-Smtp-Source: ANB0VdbpXC6hn2sjKF29TZkHQO+B1eGtVLUg2Sc11SgggHa2Uq7Si1DGRVx/gzX38uK0UpdskCj/jg== X-Received: by 2002:aed:3c55:: with SMTP id u21-v6mr20941353qte.198.1536693757296; Tue, 11 Sep 2018 12:22:37 -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.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Sep 2018 12:22:36 -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: [PATCHv2 2/2] scsi: ibmvscsis: Ensure partition name is properly NUL terminated Date: Tue, 11 Sep 2018 12:22:26 -0700 Message-Id: <20180911192226.3620-3-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 While reviewing another part of the code, Kees noticed that the strncpy of the partition name might not always be NUL terminated. Switch to using strscpy which does this safely. Reported-by: Kees Cook Signed-off-by: Laura Abbott Reviewed-by: Kees Cook Reviewed-by: Bryant G. Ly bly@catalogicsoftware.com --- v2: Switch to strscpy instead of just strlcpy --- drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c index b3a029ad07cd..f42a619198c4 100644 --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c @@ -3477,7 +3477,7 @@ static int ibmvscsis_probe(struct vio_dev *vdev, snprintf(vscsi->eye, sizeof(vscsi->eye), "VSCSI %s", vdev->name); vscsi->dds.unit_id = vdev->unit_address; - strncpy(vscsi->dds.partition_name, partition_name, + strscpy(vscsi->dds.partition_name, partition_name, sizeof(vscsi->dds.partition_name)); vscsi->dds.partition_num = partition_number;