device-dax: fix private mapping restriction, permit read-only
authorDan Williams <dan.j.williams@intel.com>
Wed, 7 Dec 2016 01:03:35 +0000 (17:03 -0800)
committerDan Williams <dan.j.williams@intel.com>
Wed, 7 Dec 2016 01:42:37 +0000 (17:42 -0800)
Hugh notes in response to commit 4cb19355ea19 "device-dax: fail all
private mapping attempts":

  "I think that is more restrictive than you intended: haven't tried, but I
  believe it rejects a PROT_READ, MAP_SHARED, O_RDONLY fd mmap, leaving no
  way to mmap /dev/dax without write permission to it."

Indeed it does restrict read-only mappings, switch to checking
VM_MAYSHARE, not VM_SHARED.

Cc: <stable@vger.kernel.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Pawel Lebioda <pawel.lebioda@intel.com>
Fixes: 4cb19355ea19 ("device-dax: fail all private mapping attempts")
Reported-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
drivers/dax/dax.c

index 3d94ff20fdca2bd64beeb86674e42abe736117de..286447a83dab809e0522e461c7e6ca416e997462 100644 (file)
@@ -271,7 +271,7 @@ static int check_vma(struct dax_dev *dax_dev, struct vm_area_struct *vma,
                return -ENXIO;
 
        /* prevent private mappings from being established */
-       if ((vma->vm_flags & VM_SHARED) != VM_SHARED) {
+       if ((vma->vm_flags & VM_MAYSHARE) != VM_MAYSHARE) {
                dev_info(dev, "%s: %s: fail, attempted private mapping\n",
                                current->comm, func);
                return -EINVAL;