Commit 243e37c6 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv6: icmp6: add drop reason support to ndisc_recv_rs() 



Change ndisc_recv_rs() to return a drop reason.

For the moment, return PKT_TOO_SMALL, NOT_SPECIFIED
or SKB_CONSUMED. More reasons are added later.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3009f9ae

net/ipv6/ndisc.c

+7 −5
Original line number Diff line number Diff line
@@ -1127,7 +1127,7 @@ static enum skb_drop_reason ndisc_recv_na(struct sk_buff *skb) 
	return reason;

}



static void ndisc_recv_rs(struct sk_buff *skb)

static enum skb_drop_reason ndisc_recv_rs(struct sk_buff *skb)

{

	struct rs_msg *rs_msg = (struct rs_msg *)skb_transport_header(skb);

	unsigned long ndoptlen = skb->len - sizeof(*rs_msg);
@@ -1136,14 +1136,15 @@ static void ndisc_recv_rs(struct sk_buff *skb) 
	const struct in6_addr *saddr = &ipv6_hdr(skb)->saddr;

	struct ndisc_options ndopts;

	u8 *lladdr = NULL;

	SKB_DR(reason);



	if (skb->len < sizeof(*rs_msg))

		return;

		return SKB_DROP_REASON_PKT_TOO_SMALL;



	idev = __in6_dev_get(skb->dev);

	if (!idev) {

		ND_PRINTK(1, err, "RS: can't find in6 device\n");

		return;

		return reason;

	}



	/* Don't accept RS if we're not in router mode */
@@ -1178,9 +1179,10 @@ static void ndisc_recv_rs(struct sk_buff *skb) 
			     NEIGH_UPDATE_F_OVERRIDE_ISROUTER,

			     NDISC_ROUTER_SOLICITATION, &ndopts);

		neigh_release(neigh);

		reason = SKB_CONSUMED;

	}

out:

	return;

	return reason;

}



static void ndisc_ra_useropt(struct sk_buff *ra, struct nd_opt_hdr *opt)
@@ -1844,7 +1846,7 @@ enum skb_drop_reason ndisc_rcv(struct sk_buff *skb) 
		break;



	case NDISC_ROUTER_SOLICITATION:

		ndisc_recv_rs(skb);

		reason = ndisc_recv_rs(skb);

		break;



	case NDISC_ROUTER_ADVERTISEMENT: