Attachment 151676 Details for Bug 234073 – don't expand legacy mmap (expanded range might span incompatible attrs)

[patch] don't expand legacy mmap (expanded range might span incompatible attrs)

xorg-x11-server-mmap-expansion.patch (text/plain), 1.30 KB, created by Bjorn Helgaas on 2007-04-04 16:38:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bjorn Helgaas

Created: 2007-04-04 16:38:54 UTC

Size: 1.30 KB

patch

obsolete

>--- ./hw/xfree86/os-support/bus/linuxPci.c.orig	2007-03-14 04:51:39.000000000 -0600
>+++ ./hw/xfree86/os-support/bus/linuxPci.c	2007-03-14 09:37:44.000000000 -0600
>@@ -578,7 +578,6 @@
> 
> #define MAX_DOMAINS 257
> static pointer DomainMmappedIO[MAX_DOMAINS];
>-static pointer DomainMmappedMem[MAX_DOMAINS];
> 
> static int
> linuxOpenLegacy(PCITAG Tag, char *name)
>@@ -636,6 +635,7 @@
> {
>     int domain = xf86GetPciDomain(Tag);
>     int fd;
>+    pointer addr;
> 
>     /*
>      * We use /proc/bus/pci on non-legacy addresses or if the Linux sysfs
>@@ -649,20 +649,14 @@
> 	return linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
> 			   PCIIOC_MMAP_IS_MEM);
> 
>-
>-    /* If we haven't already mapped this legacy space, try to. */
>-    if (!DomainMmappedMem[domain]) {
>-	DomainMmappedMem[domain] = mmap(NULL, 1024*1024, PROT_READ|PROT_WRITE,
>-					MAP_SHARED, fd, 0);
>-	if (DomainMmappedMem[domain] == MAP_FAILED) {
>-	    close(fd);
>-	    perror("mmap failure");
>-	    FatalError("xf86MapDomainMem():  mmap() failure\n");
>-	}
>+    addr = mmap(NULL, Size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, Base);
>+    if (addr == MAP_FAILED) {
>+	close (fd);
>+	perror("mmap failure");
>+	FatalError("xf86MapDomainMem():  mmap() failure\n");
>     }
>-
>     close(fd);
>-    return (pointer)((char *)DomainMmappedMem[domain] + Base);
>+    return addr;
> }
> 
> /*

Actions: View | Diff

Attachments on bug 234073: 151676 | 151677