From patchwork Fri Jan 10 18:12:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FX Le Bail X-Patchwork-Id: 309360 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 924BE2C0090 for ; Sat, 11 Jan 2014 05:30:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752600AbaAJSaz (ORCPT ); Fri, 10 Jan 2014 13:30:55 -0500 Received: from smtp11.smtpout.orange.fr ([80.12.242.133]:34419 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751449AbaAJSay (ORCPT ); Fri, 10 Jan 2014 13:30:54 -0500 Received: from localhost.localdomain ([86.214.30.166]) by mwinf5d22 with ME id CJWi1n00C3b2xSm03JWoVu; Fri, 10 Jan 2014 19:30:52 +0100 From: Francois-Xavier Le Bail To: netdev@vger.kernel.org Cc: Hannes Frederic Sowa , "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki Yoshifuji , Patrick McHardy , Francois-Xavier Le Bail Subject: [PATCH net-next] IPv6: enable bind() to assign an anycast address Date: Fri, 10 Jan 2014 19:12:24 +0100 Message-Id: <1389377544-3119-1-git-send-email-fx.lebail@yahoo.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org - Add ipv6_chk_acast_addr_src() to check if an anycast address is link-local on given interface or is global (on any interface). - Use it in inet6_bind(). Signed-off-by: Francois-Xavier Le Bail --- Tested with link-local and global anycast addresses. Tested with SOCK_DGRAM socket, bind and UDP traffic OK. Tested with SOCK_STREAM socket, bind OK, traffic need another change. include/net/addrconf.h | 5 +++-- net/ipv6/af_inet6.c | 4 +++- net/ipv6/anycast.c | 11 +++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 66c4a44..50e39a8 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -205,8 +205,9 @@ void ipv6_sock_ac_close(struct sock *sk); int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr); int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr); bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev, - const struct in6_addr *addr); - + const struct in6_addr *addr); +bool ipv6_chk_acast_addr_src(struct net *net, struct net_device *dev, + const struct in6_addr *addr); /* Device notifier */ int register_inet6addr_notifier(struct notifier_block *nb); diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index c921d5d..68b81e9 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -347,7 +347,9 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) if (!(addr_type & IPV6_ADDR_MULTICAST)) { if (!(inet->freebind || inet->transparent) && !ipv6_chk_addr(net, &addr->sin6_addr, - dev, 0)) { + dev, 0) && + !ipv6_chk_acast_addr_src(net, dev, + &addr->sin6_addr)) { err = -EADDRNOTAVAIL; goto out_unlock; } diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c index 5a80f15..9f25dda 100644 --- a/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c @@ -383,6 +383,17 @@ bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev, return found; } +/* check if address is link-local on given interface + * or is global on any interface + */ +bool ipv6_chk_acast_addr_src(struct net *net, struct net_device *dev, + const struct in6_addr *addr) +{ + if (ipv6_addr_type(addr) & IPV6_ADDR_LINKLOCAL) + return ipv6_chk_acast_dev(dev, addr); + else + return ipv6_chk_acast_addr(net, NULL, addr); +} #ifdef CONFIG_PROC_FS struct ac6_iter_state {