From 8ee28ed5f31a35db6c60786fac4fb6a26d550d14 Mon Sep 17 00:00:00 2001 From: Planet-Lab Support Date: Fri, 14 Jul 2006 15:42:27 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create tag 'before-fedora-2_6_17-1_2142_FC4-vs2_0_2-rc26-merge'. --- Makefile | 2 +- kernel/module-verify.c | 2 +- scripts/kernel-2.6-planetlab.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0bb714d7a..c4a63c4b7 100644 --- 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 7274a7834..85a23bcfe 100644 --- 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 c36b26017..88c7d10cf 100644 --- 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 -- 2.47.0