diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2018-06-08 15:16:44 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-06-08 15:16:44 -0700 |
| commit | 930218affeadd1325ea17e053f0dcecf218f5a4f (patch) | |
| tree | 203c293668a88e03b9f292cf4d5a294ca8a4275a /drivers/nvdimm/claim.c | |
| parent | b56845794e1e93121acb74ca325db965035d5545 (diff) | |
| parent | 5d8beee20d89e34ff1dcb0da84adf7607858c59d (diff) | |
Merge branch 'for-4.18/mcsafe' into libnvdimm-for-nextlibnvdimm-for-4.18
Diffstat (limited to 'drivers/nvdimm/claim.c')
| -rw-r--r-- | drivers/nvdimm/claim.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c index 30852270484f..2e96b34bc936 100644 --- a/drivers/nvdimm/claim.c +++ b/drivers/nvdimm/claim.c @@ -276,7 +276,8 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns, if (rw == READ) { if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align))) return -EIO; - return memcpy_mcsafe(buf, nsio->addr + offset, size); + if (memcpy_mcsafe(buf, nsio->addr + offset, size) != 0) + return -EIO; } if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align))) { |