Title: [3905] trunk: [#2424] Upgrade kernel from 2.6.22.12 to 2.6.22.13
- Revision
- 3905
- Author
- cooloney
- Date
- 2007-11-20 20:51:05 -0600 (Tue, 20 Nov 2007)
Log Message
[#2424] Upgrade kernel from 2.6.22.12 to 2.6.22.13
We (the -stable team) are announcing the release of the 2.6.22.13 kernel.
If fixes some security issues and any user of the 2.6.22 series is
encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between
2.6.22.12 and 2.6.22.13
The updated 2.6.22.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.22.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.22.y.git;a=summary
thanks,
greg k-h
--------
Makefile | 2 +-
kernel/exit.c | 3 +--
net/ipv4/tcp_input.c | 5 +++++
3 files changed, 7 insertions(+), 3 deletions(-)
Summary of changes from v2.6.22.12 to v2.6.22.13
================================================
Greg Kroah-Hartman (1):
Linux 2.6.22.13
Ilpo J?\195?\164rvinen (1):
TCP: Make sure write_queue_from does not begin with NULL ptr (CVE-2007-5501)
Roland McGrath (1):
wait_task_stopped: Check p->exit_state instead of TASK_TRACED (CVE-2007-5500)
Diffstat
Makefile | 2 +-
kernel/exit.c | 3 +--
net/ipv4/tcp_input.c | 5 +++++
3 files changed, 7 insertions(+), 3 deletions(-)
Modified Paths
Diff
Modified: trunk/Makefile (3904 => 3905)
--- trunk/Makefile 2007-11-21 02:17:05 UTC (rev 3904)
+++ trunk/Makefile 2007-11-21 02:51:05 UTC (rev 3905)
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 22
-EXTRAVERSION = .12
+EXTRAVERSION = .13
NAME = Holy Dancing Manatees, Batman!
# *DOCUMENTATION*
Modified: trunk/kernel/exit.c (3904 => 3905)
--- trunk/kernel/exit.c 2007-11-21 02:17:05 UTC (rev 3904)
+++ trunk/kernel/exit.c 2007-11-21 02:51:05 UTC (rev 3905)
@@ -1336,8 +1336,7 @@
int why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED;
exit_code = p->exit_code;
- if (unlikely(!exit_code) ||
- unlikely(p->state & TASK_TRACED))
+ if (unlikely(!exit_code) || unlikely(p->exit_state))
goto bail_ref;
return wait_noreap_copyout(p, pid, uid,
why, (exit_code << 8) | 0x7f,
Modified: trunk/net/ipv4/tcp_input.c (3904 => 3905)
--- trunk/net/ipv4/tcp_input.c 2007-11-21 02:17:05 UTC (rev 3904)
+++ trunk/net/ipv4/tcp_input.c 2007-11-21 02:51:05 UTC (rev 3905)
@@ -994,6 +994,9 @@
if (before(TCP_SKB_CB(ack_skb)->ack_seq, prior_snd_una - tp->max_window))
return 0;
+ if (!tp->packets_out)
+ goto out;
+
/* SACK fastpath:
* if the only SACK change is the increase of the end_seq of
* the first block then only apply that SACK block
@@ -1262,6 +1265,8 @@
(!tp->frto_highmark || after(tp->snd_una, tp->frto_highmark)))
tcp_update_reordering(sk, ((tp->fackets_out + 1) - reord), 0);
+out:
+
#if FASTRETRANS_DEBUG > 0
BUG_TRAP((int)tp->sacked_out >= 0);
BUG_TRAP((int)tp->lost_out >= 0);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
