[IPV6]: Check interface bindings on IPv6 raw socket reception
Take account of whether a socket is bound to a particular device when selecting an IPv6 raw socket to receive a packet. Also perform this check when receiving IPv6 packets with router alert options. Signed-off-by: Andrew McDonald <andrew@mcdonald.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
7af4cc3fa1
commit
0bd1b59b15
@@ -81,7 +81,8 @@ static void raw_v6_unhash(struct sock *sk)
|
||||
|
||||
/* Grumble... icmp and ip_input want to get at this... */
|
||||
struct sock *__raw_v6_lookup(struct sock *sk, unsigned short num,
|
||||
struct in6_addr *loc_addr, struct in6_addr *rmt_addr)
|
||||
struct in6_addr *loc_addr, struct in6_addr *rmt_addr,
|
||||
int dif)
|
||||
{
|
||||
struct hlist_node *node;
|
||||
int is_multicast = ipv6_addr_is_multicast(loc_addr);
|
||||
@@ -94,6 +95,9 @@ struct sock *__raw_v6_lookup(struct sock *sk, unsigned short num,
|
||||
!ipv6_addr_equal(&np->daddr, rmt_addr))
|
||||
continue;
|
||||
|
||||
if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)
|
||||
continue;
|
||||
|
||||
if (!ipv6_addr_any(&np->rcv_saddr)) {
|
||||
if (ipv6_addr_equal(&np->rcv_saddr, loc_addr))
|
||||
goto found;
|
||||
@@ -160,7 +164,7 @@ void ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
|
||||
if (sk == NULL)
|
||||
goto out;
|
||||
|
||||
sk = __raw_v6_lookup(sk, nexthdr, daddr, saddr);
|
||||
sk = __raw_v6_lookup(sk, nexthdr, daddr, saddr, skb->dev->ifindex);
|
||||
|
||||
while (sk) {
|
||||
if (nexthdr != IPPROTO_ICMPV6 || !icmpv6_filter(sk, skb)) {
|
||||
@@ -170,7 +174,8 @@ void ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
|
||||
if (clone)
|
||||
rawv6_rcv(sk, clone);
|
||||
}
|
||||
sk = __raw_v6_lookup(sk_next(sk), nexthdr, daddr, saddr);
|
||||
sk = __raw_v6_lookup(sk_next(sk), nexthdr, daddr, saddr,
|
||||
skb->dev->ifindex);
|
||||
}
|
||||
out:
|
||||
read_unlock(&raw_v6_lock);
|
||||
|
Reference in New Issue
Block a user