netlink: implement nla_put_in_addr and nla_put_in6_addr

IP addresses are often stored in netlink attributes. Add generic functions
to do that.

For nla_put_in_addr, it would be nicer to pass struct in_addr but this is
not used universally throughout the kernel, in way too many places __be32 is
used to store IPv4 address.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

11 files changed, 32 insertions, 41 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index e86f7434e3c3..5c9e94cb1b2c 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -4237,11 +4237,11 @@ static int inet6_fill_ifaddr(struct sk_buff *skb, struct inet6_ifaddr *ifa,
         }
 
         if (!ipv6_addr_any(&ifa->peer_addr)) {
-                if (nla_put(skb, IFA_LOCAL, 16, &ifa->addr) < 0 ||
-                    nla_put(skb, IFA_ADDRESS, 16, &ifa->peer_addr) < 0)
+                if (nla_put_in6_addr(skb, IFA_LOCAL, &ifa->addr) < 0 ||
+                    nla_put_in6_addr(skb, IFA_ADDRESS, &ifa->peer_addr) < 0)
                         goto error;
         } else
-                if (nla_put(skb, IFA_ADDRESS, 16, &ifa->addr) < 0)
+                if (nla_put_in6_addr(skb, IFA_ADDRESS, &ifa->addr) < 0)
                         goto error;
 
         if (put_cacheinfo(skb, ifa->cstamp, ifa->tstamp, preferred, valid) < 0)
@@ -4273,7 +4273,7 @@ static int inet6_fill_ifmcaddr(struct sk_buff *skb, struct ifmcaddr6 *ifmca,
                 return -EMSGSIZE;
 
         put_ifaddrmsg(nlh, 128, IFA_F_PERMANENT, scope, ifindex);
-        if (nla_put(skb, IFA_MULTICAST, 16, &ifmca->mca_addr) < 0 ||
+        if (nla_put_in6_addr(skb, IFA_MULTICAST, &ifmca->mca_addr) < 0 ||
             put_cacheinfo(skb, ifmca->mca_cstamp, ifmca->mca_tstamp,
                           INFINITY_LIFE_TIME, INFINITY_LIFE_TIME) < 0) {
                 nlmsg_cancel(skb, nlh);
@@ -4299,7 +4299,7 @@ static int inet6_fill_ifacaddr(struct sk_buff *skb, struct ifacaddr6 *ifaca,
                 return -EMSGSIZE;
 
         put_ifaddrmsg(nlh, 128, IFA_F_PERMANENT, scope, ifindex);
-        if (nla_put(skb, IFA_ANYCAST, 16, &ifaca->aca_addr) < 0 ||
+        if (nla_put_in6_addr(skb, IFA_ANYCAST, &ifaca->aca_addr) < 0 ||
             put_cacheinfo(skb, ifaca->aca_cstamp, ifaca->aca_tstamp,
                           INFINITY_LIFE_TIME, INFINITY_LIFE_TIME) < 0) {
                 nlmsg_cancel(skb, nlh);
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index 3cc50e2d3bf5..882124ebb438 100644
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -477,7 +477,7 @@ static int ip6addrlbl_fill(struct sk_buff *skb,
 
         ip6addrlbl_putmsg(nlh, p->prefixlen, p->ifindex, lseq);
 
-        if (nla_put(skb, IFAL_ADDRESS, 16, &p->prefix) < 0 ||
+        if (nla_put_in6_addr(skb, IFAL_ADDRESS, &p->prefix) < 0 ||
             nla_put_u32(skb, IFAL_LABEL, p->label) < 0) {
                 nlmsg_cancel(skb, nlh);
                 return -EMSGSIZE;
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 273eb26cd6d4..d313bfd88512 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -250,11 +250,9 @@ static int fib6_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
         frh->tos = rule6->tclass;
 
         if ((rule6->dst.plen &&
-             nla_put(skb, FRA_DST, sizeof(struct in6_addr),
-                     &rule6->dst.addr)) ||
+             nla_put_in6_addr(skb, FRA_DST, &rule6->dst.addr)) ||
             (rule6->src.plen &&
-             nla_put(skb, FRA_SRC, sizeof(struct in6_addr),
-                     &rule6->src.addr)))
+             nla_put_in6_addr(skb, FRA_SRC, &rule6->src.addr)))
                 goto nla_put_failure;
         return 0;
 
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 67e014d88e55..f61f7ad2d045 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -1622,8 +1622,8 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev)
             nla_put_be16(skb, IFLA_GRE_OFLAGS, p->o_flags) ||
             nla_put_be32(skb, IFLA_GRE_IKEY, p->i_key) ||
             nla_put_be32(skb, IFLA_GRE_OKEY, p->o_key) ||
-            nla_put(skb, IFLA_GRE_LOCAL, sizeof(struct in6_addr), &p->laddr) ||
-            nla_put(skb, IFLA_GRE_REMOTE, sizeof(struct in6_addr), &p->raddr) ||
+            nla_put_in6_addr(skb, IFLA_GRE_LOCAL, &p->laddr) ||
+            nla_put_in6_addr(skb, IFLA_GRE_REMOTE, &p->raddr) ||
             nla_put_u8(skb, IFLA_GRE_TTL, p->hop_limit) ||
             /*nla_put_u8(skb, IFLA_GRE_TOS, t->priority) ||*/
             nla_put_u8(skb, IFLA_GRE_ENCAP_LIMIT, p->encap_limit) ||
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 0c68012b6d6e..80543d13ea7c 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1739,10 +1739,8 @@ static int ip6_tnl_fill_info(struct sk_buff *skb, const struct net_device *dev)
         struct __ip6_tnl_parm *parm = &tunnel->parms;
 
         if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
-            nla_put(skb, IFLA_IPTUN_LOCAL, sizeof(struct in6_addr),
-                    &parm->laddr) ||
-            nla_put(skb, IFLA_IPTUN_REMOTE, sizeof(struct in6_addr),
-                    &parm->raddr) ||
+            nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
+            nla_put_in6_addr(skb, IFLA_IPTUN_REMOTE, &parm->raddr) ||
             nla_put_u8(skb, IFLA_IPTUN_TTL, parm->hop_limit) ||
             nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
             nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 1ec5b4a530d0..87a262b0f07b 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -983,10 +983,8 @@ static int vti6_fill_info(struct sk_buff *skb, const struct net_device *dev)
         struct __ip6_tnl_parm *parm = &tunnel->parms;
 
         if (nla_put_u32(skb, IFLA_VTI_LINK, parm->link) ||
-            nla_put(skb, IFLA_VTI_LOCAL, sizeof(struct in6_addr),
-                    &parm->laddr) ||
-            nla_put(skb, IFLA_VTI_REMOTE, sizeof(struct in6_addr),
-                    &parm->raddr) ||
+            nla_put_in6_addr(skb, IFLA_VTI_LOCAL, &parm->laddr) ||
+            nla_put_in6_addr(skb, IFLA_VTI_REMOTE, &parm->raddr) ||
             nla_put_be32(skb, IFLA_VTI_IKEY, parm->i_key) ||
             nla_put_be32(skb, IFLA_VTI_OKEY, parm->o_key))
                 goto nla_put_failure;
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index ff883c9d0e3c..caf6b99374e6 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -2378,8 +2378,8 @@ static int ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb,
                 rtm->rtm_protocol = RTPROT_MROUTED;
         rtm->rtm_flags    = 0;
 
-        if (nla_put(skb, RTA_SRC, 16, &c->mf6c_origin) ||
-            nla_put(skb, RTA_DST, 16, &c->mf6c_mcastgrp))
+        if (nla_put_in6_addr(skb, RTA_SRC, &c->mf6c_origin) ||
+            nla_put_in6_addr(skb, RTA_DST, &c->mf6c_mcastgrp))
                 goto nla_put_failure;
         err = __ip6mr_fill_mroute(mrt, skb, c, rtm);
         /* do not break the dump if cache is unresolved */
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 482dfb9f0f7e..c283827d60e2 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1049,8 +1049,7 @@ static void ndisc_ra_useropt(struct sk_buff *ra, struct nd_opt_hdr *opt)
 
         memcpy(ndmsg + 1, opt, opt->nd_opt_len << 3);
 
-        if (nla_put(skb, NDUSEROPT_SRCADDR, sizeof(struct in6_addr),
-                    &ipv6_hdr(ra)->saddr))
+        if (nla_put_in6_addr(skb, NDUSEROPT_SRCADDR, &ipv6_hdr(ra)->saddr))
                 goto nla_put_failure;
         nlmsg_end(skb, nlh);
 
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index b68d0e59c1f8..78284a697439 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -290,10 +290,8 @@ ipv6_getorigdst(struct sock *sk, int optval, void __user *user, int *len)
 static int ipv6_tuple_to_nlattr(struct sk_buff *skb,
                                 const struct nf_conntrack_tuple *tuple)
 {
-        if (nla_put(skb, CTA_IP_V6_SRC, sizeof(u_int32_t) * 4,
-                    &tuple->src.u3.ip6) ||
-            nla_put(skb, CTA_IP_V6_DST, sizeof(u_int32_t) * 4,
-                    &tuple->dst.u3.ip6))
+        if (nla_put_in6_addr(skb, CTA_IP_V6_SRC, &tuple->src.u3.in6) ||
+            nla_put_in6_addr(skb, CTA_IP_V6_DST, &tuple->dst.u3.in6))
                 goto nla_put_failure;
         return 0;
 
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index fe742fa0f7ff..385e9bd4f218 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2669,19 +2669,19 @@ static int rt6_fill_node(struct net *net,
                 rtm->rtm_flags |= RTM_F_CLONED;
 
         if (dst) {
-                if (nla_put(skb, RTA_DST, 16, dst))
+                if (nla_put_in6_addr(skb, RTA_DST, dst))
                         goto nla_put_failure;
                 rtm->rtm_dst_len = 128;
         } else if (rtm->rtm_dst_len)
-                if (nla_put(skb, RTA_DST, 16, &rt->rt6i_dst.addr))
+                if (nla_put_in6_addr(skb, RTA_DST, &rt->rt6i_dst.addr))
                         goto nla_put_failure;
 #ifdef CONFIG_IPV6_SUBTREES
         if (src) {
-                if (nla_put(skb, RTA_SRC, 16, src))
+                if (nla_put_in6_addr(skb, RTA_SRC, src))
                         goto nla_put_failure;
                 rtm->rtm_src_len = 128;
         } else if (rtm->rtm_src_len &&
-                   nla_put(skb, RTA_SRC, 16, &rt->rt6i_src.addr))
+                   nla_put_in6_addr(skb, RTA_SRC, &rt->rt6i_src.addr))
                 goto nla_put_failure;
 #endif
         if (iif) {
@@ -2705,14 +2705,14 @@ static int rt6_fill_node(struct net *net,
         } else if (dst) {
                 struct in6_addr saddr_buf;
                 if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 &&
-                    nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
+                    nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf))
                         goto nla_put_failure;
         }
 
         if (rt->rt6i_prefsrc.plen) {
                 struct in6_addr saddr_buf;
                 saddr_buf = rt->rt6i_prefsrc.addr;
-                if (nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
+                if (nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf))
                         goto nla_put_failure;
         }
 
@@ -2720,7 +2720,7 @@ static int rt6_fill_node(struct net *net,
                 goto nla_put_failure;
 
         if (rt->rt6i_flags & RTF_GATEWAY) {
-                if (nla_put(skb, RTA_GATEWAY, 16, &rt->rt6i_gateway) < 0)
+                if (nla_put_in6_addr(skb, RTA_GATEWAY, &rt->rt6i_gateway) < 0)
                         goto nla_put_failure;
         }
 
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 92692a7e8a2b..0e2bb538a556 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1683,8 +1683,8 @@ static int ipip6_fill_info(struct sk_buff *skb, const struct net_device *dev)
         struct ip_tunnel_parm *parm = &tunnel->parms;
 
         if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
-            nla_put_be32(skb, IFLA_IPTUN_LOCAL, parm->iph.saddr) ||
-            nla_put_be32(skb, IFLA_IPTUN_REMOTE, parm->iph.daddr) ||
+            nla_put_in_addr(skb, IFLA_IPTUN_LOCAL, parm->iph.saddr) ||
+            nla_put_in_addr(skb, IFLA_IPTUN_REMOTE, parm->iph.daddr) ||
             nla_put_u8(skb, IFLA_IPTUN_TTL, parm->iph.ttl) ||
             nla_put_u8(skb, IFLA_IPTUN_TOS, parm->iph.tos) ||
             nla_put_u8(skb, IFLA_IPTUN_PMTUDISC,
@@ -1694,10 +1694,10 @@ static int ipip6_fill_info(struct sk_buff *skb, const struct net_device *dev)
                 goto nla_put_failure;
 
 #ifdef CONFIG_IPV6_SIT_6RD
-        if (nla_put(skb, IFLA_IPTUN_6RD_PREFIX, sizeof(struct in6_addr),
-                    &tunnel->ip6rd.prefix) ||
-            nla_put_be32(skb, IFLA_IPTUN_6RD_RELAY_PREFIX,
-                         tunnel->ip6rd.relay_prefix) ||
+        if (nla_put_in6_addr(skb, IFLA_IPTUN_6RD_PREFIX,
+                             &tunnel->ip6rd.prefix) ||
+            nla_put_in_addr(skb, IFLA_IPTUN_6RD_RELAY_PREFIX,
+                            tunnel->ip6rd.relay_prefix) ||
             nla_put_u16(skb, IFLA_IPTUN_6RD_PREFIXLEN,
                         tunnel->ip6rd.prefixlen) ||
             nla_put_u16(skb, IFLA_IPTUN_6RD_RELAY_PREFIXLEN,