From patchwork Wed Aug 1 20:56:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 10556067 X-Patchwork-Delegate: christophe.varoqui@free.fr 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 6577D157D for ; Sun, 5 Aug 2018 08:46:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5437A296EF for ; Sun, 5 Aug 2018 08:46:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48E0229701; Sun, 5 Aug 2018 08:46:53 +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 mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0B8DF296F4 for ; Sun, 5 Aug 2018 08:46:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 11FDA30820D3; Sun, 5 Aug 2018 08:46:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D67181001F57; Sun, 5 Aug 2018 08:46:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8FA614EE12; Sun, 5 Aug 2018 08:46:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w71KvhpC028051 for ; Wed, 1 Aug 2018 16:57:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id AD7472156711; Wed, 1 Aug 2018 20:57:43 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with SMTP id 79094215670D; Wed, 1 Aug 2018 20:57:42 +0000 (UTC) Received: by redhat.com (sSMTP sendmail emulation); Wed, 01 Aug 2018 15:57:42 -0500 From: "Benjamin Marzinski" To: device-mapper development Date: Wed, 1 Aug 2018 15:56:58 -0500 Message-Id: <1533157038-3924-13-git-send-email-bmarzins@redhat.com> In-Reply-To: <1533157038-3924-1-git-send-email-bmarzins@redhat.com> References: <1533157038-3924-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: dm-devel@redhat.com Cc: Martin Wilck Subject: [dm-devel] [PATCH 12/32] kpartx: minor fixes to make coverity happy X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Sun, 05 Aug 2018 08:46:52 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP an open() failure for fd_dasd will return -1, not 0. Also, cast blocksize to a uint64_t to keep coverity from complaining about sign extension issues. Signed-off-by: Benjamin Marzinski --- kpartx/dasd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kpartx/dasd.c b/kpartx/dasd.c index e418d5a..94ae81b 100644 --- a/kpartx/dasd.c +++ b/kpartx/dasd.c @@ -129,7 +129,7 @@ read_dasd_pt(int fd, struct slice all, struct slice *sp, int ns) */ unlink(pathname); } - if (!fd_dasd) { + if (fd_dasd < 0) { /* Couldn't open the device */ return -1; } @@ -157,7 +157,8 @@ read_dasd_pt(int fd, struct slice all, struct slice *sp, int ns) geo.heads = 15; geo.sectors = recs_per_track(blocksize); - cyl = disksize / (blocksize * geo.heads * geo.sectors); + cyl = disksize / ((uint64_t)blocksize * geo.heads * + geo.sectors); if (cyl < LV_COMPAT_CYL) geo.cylinders = cyl; else