[Glibc-bsd-commits] r4795 - trunk/kfreebsd-9/debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2013-07-23 06:08:21 +0000 (Tue, 23 Jul 2013)
New Revision: 4795

Removed:
   trunk/kfreebsd-9/debian/patches/SA-13_06.mmap.patch
Modified:
   trunk/kfreebsd-9/debian/patches/series
Log:
SA-13_06.mmap.patch is already in STABLE-9



Deleted: trunk/kfreebsd-9/debian/patches/SA-13_06.mmap.patch
===================================================================
--- trunk/kfreebsd-9/debian/patches/SA-13_06.mmap.patch	2013-07-22 22:10:01 UTC (rev 4794)
+++ trunk/kfreebsd-9/debian/patches/SA-13_06.mmap.patch	2013-07-23 06:08:21 UTC (rev 4795)
@@ -1,26 +0,0 @@
-Description:
- Fix a bug that allowed a tracing process (e.g. gdb) to write
- to a memory-mapped file in the traced process's address space
- even if neither the traced process nor the tracing process had
- write access to that file. [13:06]
- (CVE-2013-2171)
-Origin: vendor, http://security.freebsd.org/patches/SA-13:06/mmap.patch
-Bug: http://security.freebsd.org/advisories/FreeBSD-SA-13:06.mmap.asc
-Bug-Debian: http://bugs.debian.org/712664
-Applied-Upstream: http://svnweb.freebsd.org/base?view=revision&revision=251902
-
---- a/sys/vm/vm_map.c
-+++ b/sys/vm/vm_map.c
-@@ -3805,6 +3805,12 @@
- 		vm_map_unlock_read(map);
- 		return (KERN_PROTECTION_FAILURE);
- 	}
-+	if ((fault_typea & VM_PROT_COPY) != 0 &&
-+	    (entry->max_protection & VM_PROT_WRITE) == 0 &&
-+	    (entry->eflags & MAP_ENTRY_COW) == 0) {
-+		vm_map_unlock_read(map);
-+		return (KERN_PROTECTION_FAILURE);
-+	}
- 
- 	/*
- 	 * If this page is not pageable, we have to get it for all possible

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2013-07-22 22:10:01 UTC (rev 4794)
+++ trunk/kfreebsd-9/debian/patches/series	2013-07-23 06:08:21 UTC (rev 4795)
@@ -1,5 +1,4 @@
 # Patches from (or merged in) upstream
-SA-13_06.mmap.patch
 
 000_cpuclockid2_syscall.diff
 000_cpuclockid2_compat32.diff