The exec-shield patch in testing (2.6.18-2) broke with the recent kernel update. I have prepared a fixed version, 2.6.18-3.
I cannot upload it to unstable since there is already a version 2.6.20-2
there. Can I upload it to testing-proposed-updates?
Regards,
Marcus
diff -u kernel-patch-exec-shield-2.6.18/debian/changelog
kernel-patch-exec-shield-2.6.18/debian/changelog
--- kernel-patch-exec-shield-2.6.18/debian/changelog
+++ kernel-patch-exec-shield-2.6.18/debian/changelog
@@ -1,3 +1,9 @@
+kernel-patch-exec-shield (1:2.6.18-3) testing; urgency=high
+
+ * Adjusted patch again for current 2.6.18 kernel. (Closes: 392464)
+
+ -- Marcus Better <[EMAIL PROTECTED]> Wed, 7 Mar 2007 15:13:11 +0100
+
kernel-patch-exec-shield (1:2.6.18-2) unstable; urgency=high
* Adjusted patch for current 2.6.18 kernel. (Closes: 392464)
reverted:
--- kernel-patch-exec-shield-2.6.18/exec-shield-nx-2.6.18-2.patch
+++ kernel-patch-exec-shield-2.6.18.orig/exec-shield-nx-2.6.18-2.patch
@@ -1869,8 +1869,8 @@
+}
Index: linux-exec-shield.q/mm/mprotect.c
===================================================================
+--- linux-exec-shield.q.orig/mm/mprotect.c
++++ linux-exec-shield.q/mm/mprotect.c
---- linux-source-2.6.18/mm/mprotect.c 2006-12-10 17:56:04.000000000 +0100
-+++ linux-source-2.6.18/mm/mprotect.c 2007-01-08 10:50:00.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/swapops.h>
#include <asm/uaccess.h>
@@ -1879,25 +1879,24 @@
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
+@@ -122,7 +123,7 @@ mprotect_fixup(struct vm_area_struct *vm
-@@ -133,7 +134,7 @@
struct mm_struct *mm = vma->vm_mm;
unsigned long oldflags = vma->vm_flags;
long nrpages = (end - start) >> PAGE_SHIFT;
- unsigned long charged = 0;
++ unsigned long charged = 0, old_end = vma->vm_end;
+ unsigned int mask;
+ pgprot_t newprot;
-+ unsigned long charged = 0, old_end = vma->vm_end;;
pgoff_t pgoff;
+@@ -190,6 +191,8 @@ success:
+ */
+ vma->vm_flags = newflags;
+ vma->vm_page_prot = newprot;
++ if (oldflags & VM_EXEC)
- int error;
- int dirty_accountable = 0;
-@@ -198,7 +199,9 @@
- (VM_READ|VM_WRITE|VM_EXEC)];
- dirty_accountable = 1;
- }
-+ if (oldflags & VM_EXEC)
+ arch_remove_exec_range(current->mm, old_end);
-
if (is_vm_hugetlb_page(vma))
+ hugetlb_change_protection(vma, start, end, newprot);
+ else
- hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
-
Index: linux-exec-shield.q/mm/mremap.c
===================================================================
--- linux-exec-shield.q.orig/mm/mremap.c
pgpH9CLgZXpEv.pgp
Description: PGP signature
