This commit was manufactured by cvs2svn to create tag

'before-fedora-2_6_17-1_2142_FC4-vs2_0_2-rc26-merge'.

diff --git a/Makefile b/Makefile
index 0bb714d..c4a63c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 12
-EXTRAVERSION = -1.1398_FC4.5.planetlab
+EXTRAVERSION = -1.1398_FC4.7.planetlab
 NAME=Woozy Numbat
 
 # *DOCUMENTATION*

diff --git a/kernel/module-verify.c b/kernel/module-verify.c
index 7274a78..85a23bc 100644 (file)
--- a/kernel/module-verify.c
+++ b/kernel/module-verify.c
@@ -107,7 +107,7 @@ do { if (unlikely(!(X))) { line = __LINE__; goto relacheck_error; } } while(0)
        elfcheck(hdr->e_shentsize == sizeof(Elf_Shdr));
 
        tmp = (size_t) hdr->e_shentsize * (size_t) hdr->e_shnum;
-       elfcheck(tmp < size - hdr->e_shoff);
+       elfcheck(tmp <= size - hdr->e_shoff);
 
        /* allocate a table to hold in-file section sizes */
        mvdata->secsizes = kmalloc(hdr->e_shnum * sizeof(size_t), GFP_KERNEL);

diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec
index c36b260..88c7d10 100644 (file)
--- a/scripts/kernel-2.6-planetlab.spec
+++ b/scripts/kernel-2.6-planetlab.spec
@@ -23,7 +23,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 %define rpmversion 2.6.%{sublevel}
 %define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
 
-%define release 1.1398_FC4.5%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release 1.1398_FC4.7%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 %define signmodules 0
 %define make_target bzImage