From: Chris Wright <chrisw@osdl.org>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Chuck Wolber <chuckw@quantumlinux.com>,
torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk,
"David S. Miller" <davem@davemloft.net>,
Mitsuru KANDA <mk@linux-ipv6.org>, Chris Wright <chrisw@osdl.org>
Subject: [PATCH 07/10] [PATCH] check connect(2) status for IPv6 UDP socket
Date: Thu, 29 Sep 2005 19:20:23 -0700 [thread overview]
Message-ID: <20050930022239.411732000@localhost.localdomain> (raw)
In-Reply-To: 20050930022016.640197000@localhost.localdomain
[-- Attachment #1: check-connect-status-for-IPv6-UDP-socket.patch --]
[-- Type: text/plain, Size: 1783 bytes --]
-stable review patch. If anyone has any objections, please let us know.
------------------
I think we should cache the per-socket route(dst_entry) only when the
IPv6 UDP socket is connect(2)'ed.
(which is same as IPv4 UDP send behavior)
Signed-off-by: Mitsuru KANDA <mk@linux-ipv6.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
---
net/ipv6/udp.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
Index: linux-2.6.13.y/net/ipv6/udp.c
===================================================================
--- linux-2.6.13.y.orig/net/ipv6/udp.c
+++ linux-2.6.13.y/net/ipv6/udp.c
@@ -638,6 +638,7 @@ static int udpv6_sendmsg(struct kiocb *i
int hlimit = -1;
int corkreq = up->corkflag || msg->msg_flags&MSG_MORE;
int err;
+ int connected = 0;
/* destination address check */
if (sin6) {
@@ -747,6 +748,7 @@ do_udp_sendmsg:
fl->fl_ip_dport = inet->dport;
daddr = &np->daddr;
fl->fl6_flowlabel = np->flow_label;
+ connected = 1;
}
if (!fl->oif)
@@ -769,6 +771,7 @@ do_udp_sendmsg:
}
if (!(opt->opt_nflen|opt->opt_flen))
opt = NULL;
+ connected = 0;
}
if (opt == NULL)
opt = np->opt;
@@ -787,10 +790,13 @@ do_udp_sendmsg:
ipv6_addr_copy(&final, &fl->fl6_dst);
ipv6_addr_copy(&fl->fl6_dst, rt0->addr);
final_p = &final;
+ connected = 0;
}
- if (!fl->oif && ipv6_addr_is_multicast(&fl->fl6_dst))
+ if (!fl->oif && ipv6_addr_is_multicast(&fl->fl6_dst)) {
fl->oif = np->mcast_oif;
+ connected = 0;
+ }
err = ip6_dst_lookup(sk, &dst, fl);
if (err)
@@ -841,7 +847,7 @@ do_append_data:
else if (!corkreq)
err = udp_v6_push_pending_frames(sk, up);
- if (dst)
+ if (dst&&connected)
ip6_dst_store(sk, dst,
ipv6_addr_equal(&fl->fl6_dst, &np->daddr) ?
&np->daddr : NULL);
--
next prev parent reply other threads:[~2005-09-30 2:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-30 2:20 [PATCH 00/10] -stable review Chris Wright
2005-09-30 2:20 ` [PATCH 01/10] [PATCH] yenta oops fix Chris Wright
2005-09-30 2:20 ` [PATCH 02/10] [PATCH] Fix fs/exec.c:788 (de_thread()) BUG_ON Chris Wright
2005-09-30 2:20 ` [PATCH 03/10] [PATCH] fix IPv6 per-socket multicast filtering in exact-match case Chris Wright
2005-09-30 2:20 ` [PATCH 04/10] [PATCH] ipvs: ip_vs_ftp breaks connections using persistence Chris Wright
2005-09-30 2:20 ` [PATCH 05/10] [PATCH]: Missing acct/mm calls in compat_do_execve() Chris Wright
2005-09-30 5:48 ` Hugh Dickins
2005-09-30 21:24 ` Chris Wright
2005-10-01 2:18 ` David S. Miller
2005-09-30 2:20 ` [PATCH 06/10] [PATCH] uml - Fix x86_64 page leak Chris Wright
2005-09-30 2:20 ` Chris Wright [this message]
2005-09-30 6:25 ` [PATCH 07/10] [PATCH] check connect(2) status for IPv6 UDP socket Chuck Wolber
2005-09-30 7:10 ` David S. Miller
2005-09-30 11:05 ` Mitsuru KANDA / 神田 充
2005-10-05 19:00 ` Chris Wright
2005-10-05 19:05 ` David S. Miller
2005-09-30 2:20 ` [PATCH 08/10] [PATCH] skge: set mac address oops with bonding Chris Wright
2005-09-30 2:20 ` [PATCH 09/10] [PATCH] tcp: set default congestion control correctly for incoming connections Chris Wright
2005-09-30 2:20 ` [PATCH 10/10] [TCP]: Dont over-clamp window in tcp_clamp_window() Chris Wright
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=20050930022239.411732000@localhost.localdomain \
--to=chrisw@osdl.org \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=chuckw@quantumlinux.com \
--cc=davem@davemloft.net \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mk@linux-ipv6.org \
--cc=rdunlap@xenotime.net \
--cc=stable@kernel.org \
--cc=torvalds@osdl.org \
--cc=tytso@mit.edu \
--cc=zwane@arm.linux.org.uk \
/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