diff options
Diffstat (limited to 'drivers/dax')
| -rw-r--r-- | drivers/dax/dax.c | 4 | ||||
| -rw-r--r-- | drivers/dax/pmem.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c index 29f600f2c..ff6431377 100644 --- a/drivers/dax/dax.c +++ b/drivers/dax/dax.c @@ -323,8 +323,8 @@ static int check_vma(struct dax_dev *dax_dev, struct vm_area_struct *vma, if (!dax_dev->alive) return -ENXIO; - /* prevent private / writable mappings from being established */ - if ((vma->vm_flags & (VM_NORESERVE|VM_SHARED|VM_WRITE)) == VM_WRITE) { + /* prevent private mappings from being established */ + if ((vma->vm_flags & VM_SHARED) != VM_SHARED) { dev_info(dev, "%s: %s: fail, attempted private mapping\n", current->comm, func); return -EINVAL; diff --git a/drivers/dax/pmem.c b/drivers/dax/pmem.c index 73ae849f5..76dd42dd7 100644 --- a/drivers/dax/pmem.c +++ b/drivers/dax/pmem.c @@ -77,7 +77,9 @@ static int dax_pmem_probe(struct device *dev) nsio = to_nd_namespace_io(&ndns->dev); /* parse the 'pfn' info block via ->rw_bytes */ - devm_nsio_enable(dev, nsio); + rc = devm_nsio_enable(dev, nsio); + if (rc) + return rc; altmap = nvdimm_setup_pfn(nd_pfn, &res, &__altmap); if (IS_ERR(altmap)) return PTR_ERR(altmap); |