rpms/kernel/F-11 patch-2.6.32.4-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.1062, 1.1063 kernel.spec, 1.1796, 1.1797 linux-2.6-execshield.patch, 1.108, 1.109 sources, 1.1024, 1.1025 upstream, 1.935, 1.936
Chuck Ebbert
cebbert at fedoraproject.org
Fri Jan 15 21:21:58 UTC 2010
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20474
Modified Files:
.cvsignore kernel.spec linux-2.6-execshield.patch sources
upstream
Added Files:
patch-2.6.32.4-rc1.bz2.sign
Log Message:
Linux 2.6.32.4-rc1
Fix up the execshield patch for the mremap changes in .32.4
--- NEW FILE patch-2.6.32.4-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBLT57SyGugalF9Dw4RAmiYAJ0Q2dp8wpnsDdJMH70pd89RsFODHQCffNZv
Ocd4hraOfzkae1N4lSfxvdo=
=xPpP
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1062
retrieving revision 1.1063
diff -u -p -r1.1062 -r1.1063
--- .cvsignore 7 Jan 2010 01:35:36 -0000 1.1062
+++ .cvsignore 15 Jan 2010 21:21:57 -0000 1.1063
@@ -6,3 +6,4 @@ temp-*
kernel-2.6.32
linux-2.6.32.tar.bz2
patch-2.6.32.3.bz2
+patch-2.6.32.4-rc1.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1796
retrieving revision 1.1797
diff -u -p -r1.1796 -r1.1797
--- kernel.spec 11 Jan 2010 16:41:48 -0000 1.1796
+++ kernel.spec 15 Jan 2010 21:21:57 -0000 1.1797
@@ -40,9 +40,9 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 3
+%define stable_update 4
# Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@@ -2009,6 +2009,10 @@ fi
# and build.
%changelog
+* Fri Jan 15 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.4-12.rc1
+- Linux 2.6.32.4-rc1
+- Fix up the execshield patch for the mremap changes in .32.4
+
* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.3-11
- drm-intel-no-tv-hotplug.patch: re-add lost patch from F-12
2.6.31 (#522611, #544671)
linux-2.6-execshield.patch:
arch/x86/include/asm/desc.h | 25 ++++++
arch/x86/include/asm/mmu.h | 7 +
arch/x86/include/asm/paravirt.h | 6 +
arch/x86/include/asm/paravirt_types.h | 3
arch/x86/include/asm/processor.h | 3
arch/x86/kernel/cpu/common.c | 14 +++
arch/x86/kernel/paravirt.c | 3
arch/x86/kernel/process_32.c | 48 ++++++++++++
arch/x86/kernel/traps.c | 129 +++++++++++++++++++++++++++++++---
arch/x86/mm/init.c | 6 +
arch/x86/mm/mmap.c | 5 +
arch/x86/mm/setup_nx.c | 4 +
arch/x86/mm/tlb.c | 7 +
arch/x86/vdso/vdso32-setup.c | 2
arch/x86/xen/enlighten.c | 21 +++++
fs/binfmt_elf.c | 21 ++++-
include/linux/mm.h | 8 +-
include/linux/mm_types.h | 3
include/linux/resource.h | 5 +
include/linux/sched.h | 7 +
kernel/sysctl.c | 28 +++++++
mm/mmap.c | 121 +++++++++++++++++++++++++++++--
mm/mprotect.c | 10 ++
mm/mremap.c | 4 -
24 files changed, 463 insertions(+), 27 deletions(-)
Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-execshield.patch,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- linux-2.6-execshield.patch 4 Jan 2010 15:25:47 -0000 1.108
+++ linux-2.6-execshield.patch 15 Jan 2010 21:21:58 -0000 1.109
@@ -774,7 +774,7 @@ index 73f5e4b..814b95f 100644
if (addr & ~PAGE_MASK)
return addr;
-@@ -1453,13 +1473,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1453,21 +1473,25 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
}
unsigned long
@@ -786,6 +786,14 @@ index 73f5e4b..814b95f 100644
unsigned long (*get_area)(struct file *, unsigned long,
unsigned long, unsigned long, unsigned long);
+ unsigned long error = arch_mmap_check(addr, len, flags);
+ if (error)
+ return error;
+
+ /* Careful about overflows.. */
+ if (len > TASK_SIZE)
+ return -ENOMEM;
+
- get_area = current->mm->get_unmapped_area;
+ if (exec && current->mm->get_unmapped_exec_area)
+ get_area = current->mm->get_unmapped_exec_area;
@@ -964,14 +972,16 @@ diff --git a/mm/mremap.c b/mm/mremap.c
index 97bff25..17a9fd7 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
-@@ -414,8 +414,8 @@ unsigned long do_mremap(unsigned long addr,
- if (vma->vm_flags & VM_MAYSHARE)
- map_flags |= MAP_SHARED;
-
-- new_addr = get_unmapped_area(vma->vm_file, 0, new_len,
-- vma->vm_pgoff, map_flags);
-+ new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len,
-+ vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC);
- if (new_addr & ~PAGE_MASK) {
- ret = new_addr;
- goto out;
+@@ -414,10 +414,10 @@ unsigned long do_mremap(unsigned long addr,
+ if (vma->vm_flags & VM_MAYSHARE)
+ map_flags |= MAP_SHARED;
+
+- new_addr = get_unmapped_area(vma->vm_file, 0, new_len,
++ new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len,
+ vma->vm_pgoff +
+ ((addr - vma->vm_start) >> PAGE_SHIFT),
+- map_flags);
++ map_flags, vma->vm_flags & VM_EXEC);
+ if (new_addr & ~PAGE_MASK) {
+ ret = new_addr;
+ goto out;
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1024
retrieving revision 1.1025
diff -u -p -r1.1024 -r1.1025
--- sources 7 Jan 2010 01:35:37 -0000 1.1024
+++ sources 15 Jan 2010 21:21:58 -0000 1.1025
@@ -1,2 +1,3 @@
260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
6bd3c5fea1e88bb4d0948ec3688bd8f6 patch-2.6.32.3.bz2
+89fabbfa609b6f2dd982a7d1d894d542 patch-2.6.32.4-rc1.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.935
retrieving revision 1.936
diff -u -p -r1.935 -r1.936
--- upstream 7 Jan 2010 01:35:37 -0000 1.935
+++ upstream 15 Jan 2010 21:21:58 -0000 1.936
@@ -1,2 +1,3 @@
linux-2.6.32.tar.bz2
patch-2.6.32.3.bz2
+patch-2.6.32.4-rc1.bz2
More information about the scm-commits
mailing list