Commit 3320da89 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPV6]: Replace bogus instances of inet->recverr 



While looking at this problem I noticed that IPv6 was sometimes
looking at inet->recverr which is bogus.  Here is a patch to
correct that and use np->recverr.
 
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Acked-by: default avatarHideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 357b40a1

net/ipv6/ip6_output.c

+1 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,7 @@ int ip6_push_pending_frames(struct sock *sk) 
	err = NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, skb->dst->dev, dst_output);

	if (err) {

		if (err > 0)

			err = inet->recverr ? net_xmit_errno(err) : 0;

			err = np->recverr ? net_xmit_errno(err) : 0;

		if (err)

			goto error;

	}

net/ipv6/raw.c

+2 −4
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ static int rawv6_send_hdrinc(struct sock *sk, void *from, int length, 
			struct flowi *fl, struct rt6_info *rt, 

			unsigned int flags)

{

	struct inet_sock *inet = inet_sk(sk);

	struct ipv6_pinfo *np = inet6_sk(sk);

	struct ipv6hdr *iph;

	struct sk_buff *skb;

	unsigned int hh_len;
@@ -570,7 +570,7 @@ static int rawv6_send_hdrinc(struct sock *sk, void *from, int length, 
	err = NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, rt->u.dst.dev,

		      dst_output);

	if (err > 0)

		err = inet->recverr ? net_xmit_errno(err) : 0;

		err = np->recverr ? net_xmit_errno(err) : 0;

	if (err)

		goto error;

out:
@@ -807,8 +807,6 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, 
	ip6_dst_store(sk, dst,

		      ipv6_addr_equal(&fl.fl6_dst, &np->daddr) ?

		      &np->daddr : NULL);

	if (err > 0)

		err = np->recverr ? net_xmit_errno(err) : 0;



	release_sock(sk);

out: