diff options
author | Maciej Żenczykowski <maze@google.com> | 2011-08-28 12:35:31 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-30 17:39:01 -0400 |
commit | ec0506dbe4e240ecd4c32bf74c84a88ce1ddb414 (patch) | |
tree | d8eb6a77c2f611d99a8c8b6576389c071bf5890a /net/ipv6/datagram.c | |
parent | 0f43dd546d991ca260d8a72d07f617907c508de8 (diff) | |
download | op-kernel-dev-ec0506dbe4e240ecd4c32bf74c84a88ce1ddb414.zip op-kernel-dev-ec0506dbe4e240ecd4c32bf74c84a88ce1ddb414.tar.gz |
net: relax PKTINFO non local ipv6 udp xmit check
Allow transparent sockets to be less restrictive about
the source ip of ipv6 udp packets being sent.
Google-Bug-Id: 5018138
Signed-off-by: Maciej Żenczykowski <maze@google.com>
CC: "Erik Kline" <ek@google.com>
CC: "Lorenzo Colitti" <lorenzo@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/datagram.c')
-rw-r--r-- | net/ipv6/datagram.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 9ef1831..b46e9f8 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -599,7 +599,7 @@ int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb) return 0; } -int datagram_send_ctl(struct net *net, +int datagram_send_ctl(struct net *net, struct sock *sk, struct msghdr *msg, struct flowi6 *fl6, struct ipv6_txoptions *opt, int *hlimit, int *tclass, int *dontfrag) @@ -658,7 +658,8 @@ int datagram_send_ctl(struct net *net, if (addr_type != IPV6_ADDR_ANY) { int strict = __ipv6_addr_src_scope(addr_type) <= IPV6_ADDR_SCOPE_LINKLOCAL; - if (!ipv6_chk_addr(net, &src_info->ipi6_addr, + if (!inet_sk(sk)->transparent && + !ipv6_chk_addr(net, &src_info->ipi6_addr, strict ? dev : NULL, 0)) err = -EINVAL; else |