From: "David S. Miller" <davem@redhat.com>
To: erik@hensema.net
Cc: netdev@oss.sgi.com, acme@conectiva.com.br, yoshfuji@linux-ipv6.org
Subject: FIX (was Re: Demonstration code on how to trigger tcp6_sock leak)
Date: Mon, 26 Jan 2004 12:30:42 -0800 (PST) [thread overview]
Message-ID: <20040126.123042.104046496.davem@redhat.com> (raw)
In-Reply-To: <20040124131307.GB2666@bender.home.hensema.net>
Ok, I've figured out the bug. Arnaldo only fixed one of the
two incorrect calls to sk_add_node() which should both be
__sk_add_node().
Erik give this a spin.
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1520 -> 1.1521
# net/ipv6/tcp_ipv6.c 1.76 -> 1.77
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/01/26 davem@nuts.ninka.net 1.1521
# [IPV6]: Fix TCP socket leak, do not grab socket reference when adding to main hashes.
# --------------------------------------------
#
diff -Nru a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
--- a/net/ipv6/tcp_ipv6.c Mon Jan 26 12:34:20 2004
+++ b/net/ipv6/tcp_ipv6.c Mon Jan 26 12:34:20 2004
@@ -485,7 +485,7 @@
unique:
BUG_TRAP(sk_unhashed(sk));
- sk_add_node(sk, &head->chain);
+ __sk_add_node(sk, &head->chain);
sk->sk_hashent = hash;
sock_prot_inc_use(sk->sk_prot);
write_unlock_bh(&head->lock);
next prev parent reply other threads:[~2004-01-26 20:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-01-24 13:13 Demonstration code on how to trigger tcp6_sock leak Erik Hensema
2004-01-25 5:25 ` YOSHIFUJI Hideaki / 吉藤英明
2004-01-26 20:30 ` David S. Miller [this message]
2004-01-26 22:01 ` FIX YOSHIFUJI Hideaki / 吉藤英明
2004-01-27 2:57 ` FIX Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040126.123042.104046496.davem@redhat.com \
--to=davem@redhat.com \
--cc=acme@conectiva.com.br \
--cc=erik@hensema.net \
--cc=netdev@oss.sgi.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).