Commit ba2f2520 authored by Hideaki Yoshifuji's avatar Hideaki Yoshifuji Committed by David S. Miller

[IPV6]: Missing xfrm_lookup() in icmpv6_{send,echo_reply}()

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: default avatarKazunori Miyazawa <kazunori@miyazawa.org>
Signed-off-by: default avatarHideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
SIgned-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3749f8ca
...@@ -372,6 +372,8 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info, ...@@ -372,6 +372,8 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
err = ip6_dst_lookup(sk, &dst, &fl); err = ip6_dst_lookup(sk, &dst, &fl);
if (err) if (err)
goto out; goto out;
if ((err = xfrm_lookup(&dst, &fl, sk, 0)) < 0)
goto out_dst_release;
if (hlimit < 0) { if (hlimit < 0) {
if (ipv6_addr_is_multicast(&fl.fl6_dst)) if (ipv6_addr_is_multicast(&fl.fl6_dst))
...@@ -458,6 +460,8 @@ static void icmpv6_echo_reply(struct sk_buff *skb) ...@@ -458,6 +460,8 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
err = ip6_dst_lookup(sk, &dst, &fl); err = ip6_dst_lookup(sk, &dst, &fl);
if (err) if (err)
goto out; goto out;
if ((err = xfrm_lookup(&dst, &fl, sk, 0)) < 0)
goto out_dst_release;
if (hlimit < 0) { if (hlimit < 0) {
if (ipv6_addr_is_multicast(&fl.fl6_dst)) if (ipv6_addr_is_multicast(&fl.fl6_dst))
...@@ -489,6 +493,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb) ...@@ -489,6 +493,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
out_put: out_put:
if (likely(idev != NULL)) if (likely(idev != NULL))
in6_dev_put(idev); in6_dev_put(idev);
out_dst_release:
dst_release(dst); dst_release(dst);
out: out:
icmpv6_xmit_unlock(); icmpv6_xmit_unlock();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment