netdev - TCP RB oops fixed

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20070307.213250.74747956.davem@davemloft.net>
Date:	Wed, 07 Mar 2007 21:32:50 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	netdev@...r.kernel.org
CC:	shemminger@...ux-foundation.org, ilpo.jarvinen@...sinki.fi
Subject: TCP RB oops fixed


I just checked in a fix for the TSO oops with RB-tree to
net-2.6.22 as follows:

commit 7de509de7c166598b0873dc9ef4c98424307f6b5
Author: David S. Miller <davem@...set.davemloft.net>
Date:   Wed Mar 7 21:31:17 2007 -0800

    [TCP]: Fix bug in tcp_rb_insert.
    
    We should advance rb_parent inside of the while() loop
    body not in the loop test, otherwise rb_parent is always
    NULL. :-/
    
    Signed-off-by: David S. Miller <davem@...emloft.net>

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 2599d98..b94debb 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1252,8 +1252,11 @@ static inline void tcp_rb_insert(struct sk_buff *skb, struct rb_root *root)
 
 	rb_link = &root->rb_node;
 	rb_parent = NULL;
-	while ((rb_parent = *rb_link) != NULL) {
-		struct sk_buff *tmp = rb_entry(rb_parent,struct sk_buff,rb);
+	while (*rb_link) {
+		struct sk_buff *tmp;
+
+		rb_parent = *rb_link;
+		tmp = rb_entry(rb_parent,struct sk_buff,rb);
 		if (TCP_SKB_CB(tmp)->end_seq > seq) {
 			BUG_ON(TCP_SKB_CB(tmp)->seq <= seq);
 			rb_link = &rb_parent->rb_left;
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html