rpms/kernel/devel kernel.spec, 1.424, 1.425 linux-2.6-execshield.patch, 1.81, 1.82

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20402

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
* Wed Feb 13 2008 Dave Jones <davej at redhat.com>
- Drop some pointless bits of the execshield patch.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -r1.424 -r1.425
--- kernel.spec	13 Feb 2008 21:57:30 -0000	1.424
+++ kernel.spec	14 Feb 2008 00:58:04 -0000	1.425
@@ -1743,6 +1743,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Wed Feb 13 2008 Dave Jones <davej at redhat.com>
+- Drop some pointless bits of the execshield patch.
+
 * Wed Feb 13 2008 Kyle McMartin <kmcmartin at redhat.com>
 - Fix up squashfs, hopefully...
 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- linux-2.6-execshield.patch	12 Feb 2008 06:18:04 -0000	1.81
+++ linux-2.6-execshield.patch	14 Feb 2008 00:58:04 -0000	1.82
@@ -393,31 +393,6 @@
  		if (IS_ERR_VALUE(addr)) {
  			ret = addr;
  			goto up_fail;
-diff --git a/drivers/char/random.c b/drivers/char/random.c
-index f43c89f..4ee8491 100644
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -1638,13 +1638,19 @@ EXPORT_SYMBOL(secure_dccp_sequence_number);
-  */
- unsigned int get_random_int(void)
- {
-+	unsigned int val = 0;
-+
-+#ifdef CONFIG_X86_HAS_TSC
-+	rdtscl(val);
-+#endif
-+
- 	/*
- 	 * Use IP's RNG. It suits our purpose perfectly: it re-keys itself
- 	 * every second, from the entropy pool (and thus creates a limited
- 	 * drain on it), and uses halfMD4Transform within the second. We
- 	 * also mix it with jiffies and the PID:
- 	 */
--	return secure_ip_id((__force __be32)(current->pid + jiffies));
-+	return secure_ip_id((__force __be32)(current->pid + jiffies  + (int)val));
- }
- 
- /*
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
 index 41a958a..22cbd06 100644
 --- a/fs/binfmt_elf.c
@@ -496,22 +471,6 @@
  			/*
  			 * load_elf_interp() returns relocation
  			 * adjustment
-@@ -914,12 +931,14 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
- 			interp_load_addr = elf_entry;
- 			elf_entry += loc->interp_elf_ex.e_entry;
- 		}
-+	
- 		if (BAD_ADDR(elf_entry)) {
- 			force_sig(SIGSEGV, current);
- 			retval = IS_ERR((void *)elf_entry) ?
--					(int)elf_entry : -EINVAL;
-+				(int)elf_entry : -EINVAL;
- 			goto out_free_dentry;
- 		}
-+
- 		reloc_func_desc = interp_load_addr;
- 
- 		allow_write_access(interpreter);
 @@ -934,20 +953,21 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  		}
  	}