All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vishal Verma <vishal.l.verma@intel.com>
To: linux-nvdimm@lists.01.org
Subject: [ndctl PATCH 3/4] libndctl, test: fix a couple of unchecked returns
Date: Thu,  3 May 2018 12:50:49 -0600	[thread overview]
Message-ID: <20180503185050.7559-3-vishal.l.verma@intel.com> (raw)
In-Reply-To: <20180503185050.7559-1-vishal.l.verma@intel.com>

-Wunused-result with -D_FORTIFY_SOURCE=2 reported a couple of unchecked
return values, fix them by appropriately failing on errors.

Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
 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;
-- 
2.14.3

_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm

  parent reply	other threads:[~2018-05-03 18:50 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-03 18:50 [ndctl PATCH 1/4] libndctl: fix potential buffer overflow in write_cache APIs Vishal Verma
2018-05-03 18:50 ` [ndctl PATCH 2/4] libndctl: improve debug prints in wait_for_scrub_completion Vishal Verma
2018-05-04  0:04   ` Dan Williams
2018-05-03 18:50 ` Vishal Verma [this message]
2018-05-04  0:08   ` [ndctl PATCH 3/4] libndctl, test: fix a couple of unchecked returns Dan Williams
2018-05-03 18:50 ` [ndctl PATCH 4/4] configure: add -Wunused-result and -D_FORTIFY_SOURCE=2 to cflags Vishal Verma
2018-05-03 19:06   ` Dan Williams

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180503185050.7559-3-vishal.l.verma@intel.com \
    --to=vishal.l.verma@intel.com \
    --cc=linux-nvdimm@lists.01.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.