From patchwork Thu May 3 18:50:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10378953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6C01160327 for ; Thu, 3 May 2018 18:51:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5693D2922E for ; Thu, 3 May 2018 18:51:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B16B29252; Thu, 3 May 2018 18:51:01 +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=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (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 083462922E for ; Thu, 3 May 2018 18:51:00 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E456B203BEA24; Thu, 3 May 2018 11:51:00 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id EFDE12283930C for ; Thu, 3 May 2018 11:50:58 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 May 2018 11:50:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,359,1520924400"; d="scan'208";a="225597831" Received: from vverma7-mobl4.lm.intel.com ([10.254.187.160]) by fmsmga006.fm.intel.com with ESMTP; 03 May 2018 11:50:58 -0700 From: Vishal Verma To: Subject: [ndctl PATCH 3/4] libndctl, test: fix a couple of unchecked returns Date: Thu, 3 May 2018 12:50:49 -0600 Message-Id: <20180503185050.7559-3-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180503185050.7559-1-vishal.l.verma@intel.com> References: <20180503185050.7559-1-vishal.l.verma@intel.com> X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP -Wunused-result with -D_FORTIFY_SOURCE=2 reported a couple of unchecked return values, fix them by appropriately failing on errors. Cc: Dan Williams Signed-off-by: Vishal Verma Reviewed-by: Dan Williams --- ndctl/lib/libndctl.c | 5 ++++- test/dax-pmd.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c index 6733b85..47e005e 100644 --- a/ndctl/lib/libndctl.c +++ b/ndctl/lib/libndctl.c @@ -1243,7 +1243,10 @@ NDCTL_EXPORT int ndctl_bus_wait_for_scrub_completion(struct ndctl_bus *bus) break; } dbg(ctx, "poll wake: revents: %d\n", fds.revents); - pread(fd, buf, 1, 0); + if (pread(fd, buf, 1, 0) == -1) { + rc = -errno; + break; + } fds.revents = 0; } } diff --git a/test/dax-pmd.c b/test/dax-pmd.c index 06fe522..65bee6f 100644 --- a/test/dax-pmd.c +++ b/test/dax-pmd.c @@ -125,7 +125,10 @@ int test_dax_directio(int dax_fd, unsigned long align, void *dax_addr, off_t off rc = -ENXIO; } ((char *) buf)[0] = 0; - pread(fd2, buf, 4096, 0); + if (pread(fd2, buf, 4096, 0) != 4096) { + faili(i); + rc = -ENXIO; + } if (strcmp(buf, "odirect data") != 0) { faili(i); rc = -ENXIO;