rpms/kernel/devel linux-2.6-audit-code-walking-out-of-bounds.patch, NONE, 1.1.2.1 config-rhel-generic, 1.8, 1.8.10.1 kernel-2.6.spec, 1.2519.4.17, 1.2519.4.18 linux-2.6-ehea-ethernet-driver.patch, 1.1.2.1, 1.1.2.2 linux-2.6-x86-relocatable.patch, 1.1.2.2, 1.1.2.3

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Aug 29 20:15:57 UTC 2006


Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32477

Modified Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	config-rhel-generic kernel-2.6.spec 
	linux-2.6-ehea-ethernet-driver.patch 
	linux-2.6-x86-relocatable.patch 
Added Files:
      Tag: kernel-2_6_17-1_2519_el5_beta1
	linux-2.6-audit-code-walking-out-of-bounds.patch 
Log Message:
more beta1 fixes


linux-2.6-audit-code-walking-out-of-bounds.patch:
 auditsc.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-audit-code-walking-out-of-bounds.patch ---
Date: Tue, 29 Aug 2006 15:21:52 -0400
From: Steve Grubb <sgrubb at redhat.com>
Subject: Re: [RHEL5] [PATCH] audit code walking out of bounds...

On Tuesday 29 August 2006 14:37, Peter Staubach wrote:
> This still does not look right.  It is using context->name[AUDIT_NAMES]
> and that is beyond the array bounds.  Is it not?
>
> Steve Grubb's change looked more accurate in this respect.

This is correct...and so is David...so one more try. I also noticed one more
increment farther down in the same function, so this patch covers it too. And
another increment in __audit_inode. Hopefully, this does it.

-Steve


diff -urp linux-2.6.17.x86_64.orig/kernel/auditsc.c linux-2.6.17.x86_64/kernel/auditsc.c
--- linux-2.6.17.x86_64.orig/kernel/auditsc.c	2006-08-29 11:21:20.000000000 -0400
+++ linux-2.6.17.x86_64/kernel/auditsc.c	2006-08-29 15:15:28.000000000 -0400
@@ -1281,7 +1281,15 @@ void __audit_inode(const char *name, con
 		 * associated name? */
 		if (context->name_count >= AUDIT_NAMES - AUDIT_NAMES_RESERVED)
 			return;
-		idx = context->name_count++;
+		idx = context->name_count;
+		if (context->name_count == (AUDIT_NAMES - 1)) {
+			printk(KERN_DEBUG
+				"name_count maxed and losing entry [%d]=%s\n",
+				context->name_count, 
+				context->names[context->name_count].name ?:
+				"(null)");
+		} else
+			context->name_count++;
 		context->names[idx].name = NULL;
 #if AUDIT_DEBUG
 		++context->ino_count;
@@ -1333,7 +1341,13 @@ void __audit_inode_child(const char *dna
 		}
 
 update_context:
-	idx = context->name_count++;
+	idx = context->name_count;
+	if (context->name_count == (AUDIT_NAMES - 1)) {
+		printk(KERN_DEBUG "name_count maxed and losing entry [%d]=%s\n",
+			context->name_count, 
+			context->names[context->name_count].name ?: "(null)");
+	} else
+		context->name_count++;
 #if AUDIT_DEBUG
 	context->ino_count++;
 #endif


Index: config-rhel-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/config-rhel-generic,v
retrieving revision 1.8
retrieving revision 1.8.10.1
diff -u -r1.8 -r1.8.10.1
--- config-rhel-generic	19 Jul 2006 19:25:13 -0000	1.8
+++ config-rhel-generic	29 Aug 2006 20:15:54 -0000	1.8.10.1
@@ -191,4 +191,4 @@
 # CONFIG_DECNET is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_RAW_DRIVER=y
-
+CONFIG_HZ=300


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2519.4.17
retrieving revision 1.2519.4.18
diff -u -r1.2519.4.17 -r1.2519.4.18
--- kernel-2.6.spec	25 Aug 2006 20:46:04 -0000	1.2519.4.17
+++ kernel-2.6.spec	29 Aug 2006 20:15:55 -0000	1.2519.4.18
@@ -439,6 +439,7 @@
 # SELinux/audit patches.
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
 Patch1802: linux-2.6-selinux-support-range-transitions.patch
+Patch1803: linux-2.6-audit-code-walking-out-of-bounds.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-oss-warning.patch
@@ -1011,6 +1012,7 @@
 %patch1801 -p1
 # Add support for SELinux range transitions
 %patch1802 -p1
+%patch1803 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1787,6 +1789,12 @@
 %endif
 
 %changelog
+* Tue Aug 29 2006 Don Zickus <dzickus at redhat.com>
+- added #184752 - need to enable EHEA driver (Don Zickus)
+- added #203861 - cachefs corruption (Steve Grubb)
+- added #198594 - setting HZ to 300 (Don Zickus)
+- added #204317 - typo in relocatable patch (Vivek Goyal)
+
 * Fri Aug 25 2006 Don Zickus <dzickus at redhat.com>
 - really turn on building kernel headers
 - build headers fix (need i386)

linux-2.6-ehea-ethernet-driver.patch:
 Kconfig             |    7 
 ehea/Makefile       |    7 
 ehea/ehea.h         |  434 ++++++++
 ehea/ehea_ethtool.c |  325 ++++++
 ehea/ehea_hcall.h   |   52 +
 ehea/ehea_hw.h      |  319 ++++++
 ehea/ehea_main.c    | 2560 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 ehea/ehea_phyp.c    | 1020 ++++++++++++++++++++
 ehea/ehea_phyp.h    |  625 ++++++++++++
 ehea/ehea_qmr.c     |  719 ++++++++++++++
 ehea/ehea_qmr.h     |  390 +++++++
 11 files changed, 6458 insertions(+)

Index: linux-2.6-ehea-ethernet-driver.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ehea-ethernet-driver.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-ehea-ethernet-driver.patch	17 Aug 2006 22:59:24 -0000	1.1.2.1
+++ linux-2.6-ehea-ethernet-driver.patch	29 Aug 2006 20:15:55 -0000	1.1.2.2
@@ -6478,6 +6478,22 @@
 +#endif	/* __EHEA_HW_H__ */
 
 
+--- linux-2.6.17.1/drivers/net/Kconfig	2006-06-20 02:31:55.000000000 -0700
++++ patched_kernel/drivers/net/Kconfig	2006-06-20 03:53:45.896352432 -0700
+@@ -2247,6 +2247,13 @@ config CHELSIO_T1
+	   To compile this driver as a module, choose M here: the module
+	   will be called cxgb.
+
++config EHEA
++	 tristate "eHEA Ethernet support"
++	 depends on IBMEBUS
++	 ---help---
++	   This driver supports the eHEA IBM ethernet adapter for eServer System p
++
++
+ config IXGB
+ 	tristate "Intel(R) PRO/10GbE support"
+ 	depends on PCI
 --- linux-2.6.17-rc6-orig/drivers/net/ehea/Makefile	1969-12-31 16:00:00.000000000 -0800
 +++ kernel/drivers/net/ehea/Makefile	2006-06-09 05:29:59.170253728 -0700
 @@ -0,0 +1,7 @@

linux-2.6-x86-relocatable.patch:
 b/arch/i386/Kconfig                                              |   13 
 b/arch/i386/Makefile                                             |    2 
 b/arch/i386/boot/Makefile                                        |    2 
 b/arch/i386/boot/bootsect.S                                      |   97 +
 b/arch/i386/boot/compressed/Makefile                             |   22 
 b/arch/i386/boot/compressed/head.S                               |  184 ++-
 b/arch/i386/boot/compressed/misc.c                               |  513 ++++++---
 b/arch/i386/boot/compressed/relocs.c                             |  563 ++++++++++
 b/arch/i386/boot/compressed/vmlinux.lds                          |   40 
 b/arch/i386/boot/compressed/vmlinux.scr                          |    3 
 b/arch/i386/boot/setup.S                                         |   29 
 b/arch/i386/boot/tools/build.c                                   |  214 +++
 b/arch/i386/kernel/alternative.c                                 |    8 
 b/arch/i386/kernel/setup.c                                       |    4 
 b/arch/i386/kernel/vmlinux.lds.S                                 |  114 +-
 b/arch/i386/mm/init.c                                            |   15 
 b/arch/x86_64/Kconfig                                            |   19 
 b/arch/x86_64/boot/Makefile                                      |    2 
 b/arch/x86_64/boot/bootsect.S                                    |   93 +
 b/arch/x86_64/boot/compressed/Makefile                           |   13 
 b/arch/x86_64/boot/compressed/head.S                             |  301 +++--
 b/arch/x86_64/boot/compressed/misc.c                             |  500 ++++++--
 b/arch/x86_64/boot/compressed/vmlinux.lds                        |   44 
 b/arch/x86_64/boot/compressed/vmlinux.scr                        |    5 
 b/arch/x86_64/boot/tools/build.c                                 |  232 +++-
 b/arch/x86_64/defconfig                                          |    1 
 b/arch/x86_64/kernel/acpi/sleep.c                                |   19 
 b/arch/x86_64/kernel/acpi/wakeup.S                               |  325 ++---
 b/arch/x86_64/kernel/e820.c                                      |   13 
 b/arch/x86_64/kernel/early_printk.c                              |    3 
 b/arch/x86_64/kernel/head.S                                      |  326 ++---
 b/arch/x86_64/kernel/head64.c                                    |   35 
 b/arch/x86_64/kernel/setup.c                                     |   29 
 b/arch/x86_64/kernel/setup64.c                                   |    1 
 b/arch/x86_64/kernel/smp.c                                       |    2 
 b/arch/x86_64/kernel/suspend.c                                   |    3 
 b/arch/x86_64/kernel/trampoline.S                                |  168 ++
 b/arch/x86_64/kernel/vmlinux.lds.S                               |    2 
 b/arch/x86_64/kernel/vsyscall.c                                  |   10 
 b/arch/x86_64/mm/fault.c                                         |    4 
 b/arch/x86_64/mm/init.c                                          |  288 ++---
 b/arch/x86_64/mm/pageattr.c                                      |   20 
 b/include/asm-generic/vmlinux.lds.h                              |    2 
 b/include/asm-i386/page.h                                        |    4 
 b/include/asm-x86_64/const.h                                     |   20 
 b/include/asm-x86_64/page.h                                      |   44 
 b/include/asm-x86_64/pgtable.h                                   |   39 
 b/include/asm-x86_64/proto.h                                     |    2 
 b/include/asm-x86_64/segment.h                                   |    4 
 b/include/asm-x86_64/suspend.h                                   |   13 
 b/include/linux/elf.h                                            |   27 
 b/include/linux/elf_boot.h                                       |   19 
 b/include/linux/screen_info.h                                    |    3 
 b/scripts/kallsyms.c                                             |   30 
 linux-2.6.17.noarch/arch/x86_64/mm/init.c                        |    2 
 linux-2.6.18-rc3-1M-root/arch/i386/Kconfig                       |   34 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/bootsect.S               |    8 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/head.S        |   28 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/misc.c        |    7 
 linux-2.6.18-rc3-1M-root/arch/i386/boot/compressed/vmlinux.lds   |    3 
 linux-2.6.18-rc3-1M-root/arch/i386/kernel/vmlinux.lds.S          |    5 
 linux-2.6.18-rc3-1M-root/arch/powerpc/kernel/vmlinux.lds.S       |    1 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/Makefile               |    3 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/compressed/vmlinux.lds |    2 
 linux-2.6.18-rc3-1M-root/arch/x86_64/boot/tools/build.c          |  129 +-
 linux-2.6.18-rc3-1M-root/include/asm-i386/boot.h                 |    6 
 66 files changed, 3401 insertions(+), 1315 deletions(-)

Index: linux-2.6-x86-relocatable.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86-relocatable.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- linux-2.6-x86-relocatable.patch	24 Aug 2006 23:18:42 -0000	1.1.2.2
+++ linux-2.6-x86-relocatable.patch	29 Aug 2006 20:15:55 -0000	1.1.2.3
@@ -273,7 +273,7 @@
 +	 * a relocatable kernel this is the delta to our load address otherwise
 +	 * this is the delta to CONFIG_PHYSICAL start.
 +	 */
-+#ifdef CONFIG_RELOCTABLE
++#ifdef CONFIG_RELOCATABLE
 +	movl %ebp, %ebx
 +#else
 +	movl $(CONFIG_PHYSICAL_START - startup_32), %ebx
@@ -7040,7 +7040,7 @@
 -	 * this is the delta to CONFIG_PHYSICAL start.
 -	 */
 +
- #ifdef CONFIG_RELOCTABLE
+ #ifdef CONFIG_RELOCATABLE
 -	movl %ebp, %ebx
 +	movl 	%ebp, %ebx
 +	addl    $(CONFIG_PHYSICAL_ALIGN - 1), %ebx




More information about the fedora-cvs-commits mailing list