* [PATCH] IPV6: missing xfrm_loock() in icmpv6_{send,echo_reply}()
@ 2004-09-15 0:04 YOSHIFUJI Hideaki / 吉藤英明
2004-09-15 5:49 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: YOSHIFUJI Hideaki / 吉藤英明 @ 2004-09-15 0:04 UTC (permalink / raw)
To: davem; +Cc: netdev, yoshfuji, miyazawa
Hello.
net/ipv6/icmp.c was not converted in xfrm_lookup() extraction patch.
This patch converts it; adding the missing call to xfrm_lookup in
icmpv6_{send,echo_reply}().
Signed-off-by: Kazunori Miyazawa <kazunori@miyazawa.org>
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Thanks.
===== net/ipv6/icmp.c 1.58 vs edited =====
--- 1.58/net/ipv6/icmp.c 2004-08-24 06:29:43 +09:00
+++ edited/net/ipv6/icmp.c 2004-09-15 08:53:05 +09:00
@@ -372,6 +372,8 @@
err = ip6_dst_lookup(sk, &dst, &fl);
if (err)
goto out;
+ if ((err = xfrm_lookup(&dst, &fl, sk, 0)) < 0)
+ goto out_dst_release;
if (hlimit < 0) {
if (ipv6_addr_is_multicast(&fl.fl6_dst))
@@ -458,6 +460,8 @@
err = ip6_dst_lookup(sk, &dst, &fl);
if (err)
goto out;
+ if ((err = xfrm_lookup(&dst, &fl, sk, 0)) < 0)
+ goto out_dst_release;
if (hlimit < 0) {
if (ipv6_addr_is_multicast(&fl.fl6_dst))
@@ -489,6 +493,7 @@
out_put:
if (likely(idev != NULL))
in6_dev_put(idev);
+out_dst_release:
dst_release(dst);
out:
icmpv6_xmit_unlock();
--
Hideaki YOSHIFUJI @ USAGI Project <yoshfuji@linux-ipv6.org>
GPG FP: 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-09-15 5:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-09-15 0:04 [PATCH] IPV6: missing xfrm_loock() in icmpv6_{send,echo_reply}() YOSHIFUJI Hideaki / 吉藤英明
2004-09-15 5:49 ` David S. Miller
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).