Author: adamg Date: Mon Feb 2 20:50:06 2009 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated to 2.6.28.3
---- Files affected:
SOURCES:
linux-2.6-grsec_full.patch (1.1.2.52 -> 1.1.2.53)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-grsec_full.patch
diff -u SOURCES/linux-2.6-grsec_full.patch:1.1.2.52
SOURCES/linux-2.6-grsec_full.patch:1.1.2.53
--- SOURCES/linux-2.6-grsec_full.patch:1.1.2.52 Sun Jan 18 03:07:49 2009
+++ SOURCES/linux-2.6-grsec_full.patch Mon Feb 2 21:49:59 2009
@@ -13825,26 +13825,6 @@
diff -urNp linux-2.6.28/arch/x86/mm/pat.c linux-2.6.28/arch/x86/mm/pat.c
--- linux-2.6.28/arch/x86/mm/pat.c 2008-12-24 18:26:37.000000000 -0500
+++ linux-2.6.28/arch/x86/mm/pat.c 2009-01-11 07:20:06.000000000 -0500
-@@ -333,6 +333,9 @@ int reserve_memtype(u64 start, u64 end,
- req_type & _PAGE_CACHE_MASK);
- }
-
-+ if (new_type)
-+ *new_type = actual_type;
-+
- is_range_ram = pagerange_is_ram(start, end);
- if (is_range_ram == 1)
- return reserve_ram_pages_type(start, end, req_type, new_type);
-@@ -347,9 +350,6 @@ int reserve_memtype(u64 start, u64 end,
- new->end = end;
- new->type = actual_type;
-
-- if (new_type)
-- *new_type = actual_type;
--
- spin_lock(&memtype_lock);
-
- if (cached_entry && start >= cached_start)
@@ -474,7 +474,7 @@ pgprot_t phys_mem_access_prot(struct fil
return vma_prot;
}
@@ -34438,13 +34418,12 @@
if (vm_flags & VM_EXECUTABLE)
added_exe_file_vma(mm);
} else if (vm_flags & VM_SHARED) {
-@@ -1211,12 +1345,29 @@ munmap_back:
- vma->vm_flags, NULL, file, pgoff, vma_policy(vma))) {
+@@ -1349,13 +1349,26 @@
+ if (merged_vma) {
mpol_put(vma_policy(vma));
kmem_cache_free(vm_area_cachep, vma);
+ vma = NULL;
fput(file);
-+
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (vma_m) {
+ kmem_cache_free(vm_area_cachep, vma_m);
@@ -34453,18 +34432,16 @@
+ removed_exe_file_vma(mm);
+ }
+#endif
-+
if (vm_flags & VM_EXECUTABLE)
removed_exe_file_vma(mm);
+ vma = merged_vma;
} else {
vma_link(mm, vma, prev, rb_link, rb_parent);
file = vma->vm_file;
-+
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (vma_m)
+ pax_mirror_vma(vma_m, vma);
+#endif
-+
}
/* Once vma denies write, undo our temporary denial count */
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-grsec_full.patch?r1=1.1.2.52&r2=1.1.2.53&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
