Skip to contentSkip to conversation

Linux 2.6.16.21

DISCUSSION Chris Wright 1 participant 2 messages Jun 20, 2006

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

We (the -stable team) are announcing the release of the 2.6.16.21 kernel. This has a couple local DoS fixes, and a SCTP fix.

The diffstat and short summary of the fixes are below.

I'll also be replying to this message with a copy of the patch between 2.6.16.20 and 2.6.16.21, as it is small enough to do so.

The updated 2.6.16.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.16.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/

thanks,
-chris

--------

 Makefile                        |    2 -
 arch/powerpc/kernel/signal_32.c |   11 ++++++++-
 arch/powerpc/kernel/signal_64.c |    2 +
 kernel/exit.c                   |    8 -------
 kernel/posix-cpu-timers.c       |   45 +++++++++++++++++++---------------------
 net/netfilter/xt_sctp.c         |    2 -
 6 files changed, 36 insertions(+), 34 deletions(-)

Summary of changes from v2.6.16.20 to v2.6.16.21
================================================

Chris Wright:

      Linux 2.6.16.21

Oleg Nesterov:
check_process_timers: fix possible lockup
run_posix_cpu_timers: remove a bogus BUG_ON() (CVE-2006-2445)

Patrick McHardy:
xt_sctp: fix endless loop caused by 0 chunk length (CVE-2006-3085)

Paul Mackerras:
powerpc: Fix machine check problem on 32-bit kernels (CVE-2006-2448)

#1 lore raw
Makefile +1 -1
index 600c769..7ae2744 100644
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 16
-EXTRAVERSION = .20
+EXTRAVERSION = .21
 NAME=Sliding Snow Leopard
 
 # *DOCUMENTATION*
arch/powerpc/kernel/signal_32.c +10 -1
index d7a4e81..7fb9ff6 100644
@@ -802,10 +802,13 @@ #ifdef CONFIG_PPC64
 		if (__get_user(cmcp, &ucp->uc_regs))
 			return -EFAULT;
 		mcp = (struct mcontext __user *)(u64)cmcp;
+		/* no need to check access_ok(mcp), since mcp < 4GB */
 	}
 #else
 	if (__get_user(mcp, &ucp->uc_regs))
 		return -EFAULT;
+	if (!access_ok(VERIFY_READ, mcp, sizeof(*mcp)))
+		return -EFAULT;
 #endif
 	restore_sigmask(&set);
 	if (restore_user_regs(regs, mcp, sig))
@@ -907,13 +910,14 @@ int sys_debug_setcontext(struct ucontext
 {
 	struct sig_dbg_op op;
 	int i;
+	unsigned char tmp;
 	unsigned long new_msr = regs->msr;
 #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
 	unsigned long new_dbcr0 = current->thread.dbcr0;
 #endif
 
 	for (i=0; i<ndbg; i++) {
-		if (__copy_from_user(&op, dbg, sizeof(op)))
+		if (copy_from_user(&op, dbg + i, sizeof(op)))
 			return -EFAULT;
 		switch (op.dbg_type) {
 		case SIG_DBG_SINGLE_STEPPING:
@@ -958,6 +962,11 @@ #if defined(CONFIG_4xx) || defined(CONFI
 	current->thread.dbcr0 = new_dbcr0;
 #endif
 
+	if (!access_ok(VERIFY_READ, ctx, sizeof(*ctx))
+	    || __get_user(tmp, (u8 __user *) ctx)
+	    || __get_user(tmp, (u8 __user *) (ctx + 1) - 1))
+		return -EFAULT;
+
 	/*
 	 * If we get a fault copying the context into the kernel's
 	 * image of the user's registers, we can't just return -EFAULT
arch/powerpc/kernel/signal_64.c +2 -0
index 096dfdc..f1715f3 100644
@@ -183,6 +183,8 @@ #ifdef CONFIG_ALTIVEC
 	err |= __get_user(msr, &sc->gp_regs[PT_MSR]);
 	if (err)
 		return err;
+	if (v_regs && !access_ok(VERIFY_READ, v_regs, 34 * sizeof(vector128)))
+		return -EFAULT;
 	/* Copy 33 vec registers (vr0..31 and vscr) from the stack */
 	if (v_regs != 0 && (msr & MSR_VEC) != 0)
 		err |= __copy_from_user(current->thread.vr, v_regs,
kernel/exit.c +0 -8
index 531aadc..fc46c9a 100644
@@ -828,14 +828,6 @@ fastcall NORET_TYPE void do_exit(long co
 
 	tsk->flags |= PF_EXITING;
 
-	/*
-	 * Make sure we don't try to process any timer firings
-	 * while we are already exiting.
-	 */
- 	tsk->it_virt_expires = cputime_zero;
- 	tsk->it_prof_expires = cputime_zero;
-	tsk->it_sched_expires = 0;
-
 	if (unlikely(in_atomic()))
 		printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",
 				current->comm, current->pid,
kernel/posix-cpu-timers.c +22 -23

69 lines not on this page · raw message

net/netfilter/xt_sctp.c +1 -1
index 10fbfc5..2390182 100644
@@ -62,7 +62,7 @@ #endif
 
 	do {
 		sch = skb_header_pointer(skb, offset, sizeof(_sch), &_sch);
-		if (sch == NULL) {
+		if (sch == NULL || sch->length == 0) {
 			duprintf("Dropping invalid SCTP packet.\n");
 			*hotdrop = 1;
 			return 0;