Attachment 151677 Details for Bug 234073 – check for mmap failure

[patch] check for mmap failure

xorg-x11-server-mmap-failure.patch (text/plain), 1.29 KB, created by Bjorn Helgaas on 2007-04-04 16:39:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bjorn Helgaas

Created: 2007-04-04 16:39:56 UTC

Size: 1.29 KB

patch

obsolete

>--- ./hw/xfree86/os-support/bus/linuxPci.c.orig	2007-03-14 09:37:44.000000000 -0600
>+++ ./hw/xfree86/os-support/bus/linuxPci.c	2007-03-14 09:41:01.000000000 -0600
>@@ -634,28 +634,28 @@
> 		    ADDRESS Base, unsigned long Size)
> {
>     int domain = xf86GetPciDomain(Tag);
>-    int fd;
>+    int fd = -1;
>     pointer addr;
> 
>     /*
>      * We use /proc/bus/pci on non-legacy addresses or if the Linux sysfs
>      * legacy_mem interface is unavailable.
>      */
>-    if (Base > 1024*1024)
>-	return linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
>+    if (Base >= 1024*1024)
>+	addr = linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
> 			   PCIIOC_MMAP_IS_MEM);
>-
>-    if ((fd = linuxOpenLegacy(Tag, "legacy_mem")) < 0)
>-	return linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
>+    else if ((fd = linuxOpenLegacy(Tag, "legacy_mem")) < 0)
>+	addr = linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
> 			   PCIIOC_MMAP_IS_MEM);
>+    else
>+	addr = mmap(NULL, Size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, Base);
> 
>-    addr = mmap(NULL, Size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, Base);
>-    if (addr == MAP_FAILED) {
>-	close (fd);
>+    if (fd >= 0)
>+	close(fd);
>+    if (addr == NULL || addr == MAP_FAILED) {
> 	perror("mmap failure");
> 	FatalError("xf86MapDomainMem():  mmap() failure\n");
>     }
>-    close(fd);
>     return addr;
> }
>

Actions: View | Diff

Attachments on bug 234073: 151676 | 151677