linux-kernel - [PATCH 1/2] drm: Fix mismerge of non-coherent DMA patch

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Sun, 20 Apr 2008 10:26:25 +1000
From:	Benjamin Herrenschmidt <benh@...nel.crashing.org>
To:	David Airlie <airlied@...ux.ie>
CC:	<linux-kernel@...r.kernel.org>, <stevewin@...ibm.com>
Subject: [PATCH 1/2] drm: Fix mismerge of non-coherent DMA patch

The patch for supporting non coherent PCI DMA in the DRM was mismerged
causing the page protection to be updated for the wrong type of
mapping.

Signed-off-by: Benjamin Herrenschmidt <benh@...nel.crashing.org>
---

David, if ok, please fwd to stable too.

 drivers/char/drm/drm_vm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-work.orig/drivers/char/drm/drm_vm.c	2008-04-19 16:49:48.000000000 +1000
+++ linux-work/drivers/char/drm/drm_vm.c	2008-04-19 16:49:55.000000000 +1000
@@ -640,12 +640,12 @@ static int drm_mmap_locked(struct file *
 		/* Don't let this area swap.  Change when
 		   DRM_KERNEL advisory is supported. */
 		vma->vm_flags |= VM_RESERVED;
-		vma->vm_page_prot = drm_dma_prot(map->type, vma);
 		break;
 	case _DRM_SCATTER_GATHER:
 		vma->vm_ops = &drm_vm_sg_ops;
 		vma->vm_private_data = (void *)map;
 		vma->vm_flags |= VM_RESERVED;
+		vma->vm_page_prot = drm_dma_prot(map->type, vma);
 		break;
 	default:
 		return -EINVAL;	/* This should never happen. */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/