svn commit: r368522 - stable/12/sys/dev/drm2

[John Baldwin]

Author: jhb
Date: Thu Dec 10 20:44:05 2020
New Revision: 368522
URL: https://svnweb.freebsd.org/changeset/base/368522

Log:
  MFC 366494: Don't permit DRM buffer mappings to be upgraded to executable.

Modified:
  stable/12/sys/dev/drm2/drm_bufs.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/drm2/drm_bufs.c
==============================================================================
--- stable/12/sys/dev/drm2/drm_bufs.c	Thu Dec 10 19:36:33 2020	(r368521)
+++ stable/12/sys/dev/drm2/drm_bufs.c	Thu Dec 10 20:44:05 2020	(r368522)
@@ -1635,14 +1635,12 @@ int drm_mapbufs(struct drm_device *dev, void *data,
 				goto done;
 			}
 			retcode = vm_mmap(&vms->vm_map, &virtual, map->size,
-			    VM_PROT_READ | VM_PROT_WRITE, VM_PROT_ALL,
-			    MAP_SHARED | MAP_NOSYNC, OBJT_DEVICE,
-			    file_priv->minor->device, token);
+			    VM_PROT_RW, VM_PROT_RW, MAP_SHARED | MAP_NOSYNC,
+			    OBJT_DEVICE, file_priv->minor->device, token);
 		} else {
 			retcode = vm_mmap(&vms->vm_map, &virtual, dma->byte_count,
-			    VM_PROT_READ | VM_PROT_WRITE, VM_PROT_ALL,
-			    MAP_SHARED | MAP_NOSYNC, OBJT_DEVICE,
-			    file_priv->minor->device, 0);
+			    VM_PROT_RW, VM_PROT_RW, MAP_SHARED | MAP_NOSYNC,
+			    OBJT_DEVICE, file_priv->minor->device, 0);
 		}
 		if (retcode) {
 			/* Real error */