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>

10 files changed, 31 insertions, 31 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 975ee5e30c64..66cd85973056 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1541,11 +1541,11 @@ static int inet_fill_ifaddr(struct sk_buff *skb, struct in_ifaddr *ifa,
                 valid = INFINITY_LIFE_TIME;
         }
         if ((ifa->ifa_address &&
-             nla_put_be32(skb, IFA_ADDRESS, ifa->ifa_address)) ||
+             nla_put_in_addr(skb, IFA_ADDRESS, ifa->ifa_address)) ||
             (ifa->ifa_local &&
-             nla_put_be32(skb, IFA_LOCAL, ifa->ifa_local)) ||
+             nla_put_in_addr(skb, IFA_LOCAL, ifa->ifa_local)) ||
             (ifa->ifa_broadcast &&
-             nla_put_be32(skb, IFA_BROADCAST, ifa->ifa_broadcast)) ||
+             nla_put_in_addr(skb, IFA_BROADCAST, ifa->ifa_broadcast)) ||
             (ifa->ifa_label[0] &&
              nla_put_string(skb, IFA_LABEL, ifa->ifa_label)) ||
             nla_put_u32(skb, IFA_FLAGS, ifa->ifa_flags) ||
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index e9bc5e42cf43..edfea0deec43 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -279,9 +279,9 @@ static int fib4_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
         frh->tos = rule4->tos;
 
         if ((rule4->dst_len &&
-             nla_put_be32(skb, FRA_DST, rule4->dst)) ||
+             nla_put_in_addr(skb, FRA_DST, rule4->dst)) ||
             (rule4->src_len &&
-             nla_put_be32(skb, FRA_SRC, rule4->src)))
+             nla_put_in_addr(skb, FRA_SRC, rule4->src)))
                 goto nla_put_failure;
 #ifdef CONFIG_IP_ROUTE_CLASSID
         if (rule4->tclassid &&
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 66c1e4fbf884..453b24e5322c 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -1015,7 +1015,7 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event,
         rtm->rtm_protocol = fi->fib_protocol;
 
         if (rtm->rtm_dst_len &&
-            nla_put_be32(skb, RTA_DST, dst))
+            nla_put_in_addr(skb, RTA_DST, dst))
                 goto nla_put_failure;
         if (fi->fib_priority &&
             nla_put_u32(skb, RTA_PRIORITY, fi->fib_priority))
@@ -1024,11 +1024,11 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event,
                 goto nla_put_failure;
 
         if (fi->fib_prefsrc &&
-            nla_put_be32(skb, RTA_PREFSRC, fi->fib_prefsrc))
+            nla_put_in_addr(skb, RTA_PREFSRC, fi->fib_prefsrc))
                 goto nla_put_failure;
         if (fi->fib_nhs == 1) {
                 if (fi->fib_nh->nh_gw &&
-                    nla_put_be32(skb, RTA_GATEWAY, fi->fib_nh->nh_gw))
+                    nla_put_in_addr(skb, RTA_GATEWAY, fi->fib_nh->nh_gw))
                         goto nla_put_failure;
                 if (fi->fib_nh->nh_oif &&
                     nla_put_u32(skb, RTA_OIF, fi->fib_nh->nh_oif))
@@ -1058,7 +1058,7 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event,
                         rtnh->rtnh_ifindex = nh->nh_oif;
 
                         if (nh->nh_gw &&
-                            nla_put_be32(skb, RTA_GATEWAY, nh->nh_gw))
+                            nla_put_in_addr(skb, RTA_GATEWAY, nh->nh_gw))
                                 goto nla_put_failure;
 #ifdef CONFIG_IP_ROUTE_CLASSID
                         if (nh->nh_tclassid &&
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 6207275fc749..2e878df46075 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -776,8 +776,8 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev)
             nla_put_be16(skb, IFLA_GRE_OFLAGS, tnl_flags_to_gre_flags(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_be32(skb, IFLA_GRE_LOCAL, p->iph.saddr) ||
-            nla_put_be32(skb, IFLA_GRE_REMOTE, p->iph.daddr) ||
+            nla_put_in_addr(skb, IFLA_GRE_LOCAL, p->iph.saddr) ||
+            nla_put_in_addr(skb, IFLA_GRE_REMOTE, p->iph.daddr) ||
             nla_put_u8(skb, IFLA_GRE_TTL, p->iph.ttl) ||
             nla_put_u8(skb, IFLA_GRE_TOS, p->iph.tos) ||
             nla_put_u8(skb, IFLA_GRE_PMTUDISC,
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 94efe148181c..f189f2a8aaa5 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -505,8 +505,8 @@ static int vti_fill_info(struct sk_buff *skb, const struct net_device *dev)
         nla_put_u32(skb, IFLA_VTI_LINK, p->link);
         nla_put_be32(skb, IFLA_VTI_IKEY, p->i_key);
         nla_put_be32(skb, IFLA_VTI_OKEY, p->o_key);
-        nla_put_be32(skb, IFLA_VTI_LOCAL, p->iph.saddr);
-        nla_put_be32(skb, IFLA_VTI_REMOTE, p->iph.daddr);
+        nla_put_in_addr(skb, IFLA_VTI_LOCAL, p->iph.saddr);
+        nla_put_in_addr(skb, IFLA_VTI_REMOTE, p->iph.daddr);
 
         return 0;
 }
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 915d215a7d14..17df8d38bbbd 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -450,8 +450,8 @@ static int ipip_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,
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index c688cd1b2110..b4a545d24adb 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -2281,8 +2281,8 @@ static int ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
                 rtm->rtm_protocol = RTPROT_MROUTED;
         rtm->rtm_flags    = 0;
 
-        if (nla_put_be32(skb, RTA_SRC, c->mfc_origin) ||
-            nla_put_be32(skb, RTA_DST, c->mfc_mcastgrp))
+        if (nla_put_in_addr(skb, RTA_SRC, c->mfc_origin) ||
+            nla_put_in_addr(skb, RTA_DST, c->mfc_mcastgrp))
                 goto nla_put_failure;
         err = __ipmr_fill_mroute(mrt, skb, c, rtm);
         /* do not break the dump if cache is unresolved */
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 5c61328b7704..b36ebfc6b812 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -322,8 +322,8 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len)
 static int ipv4_tuple_to_nlattr(struct sk_buff *skb,
                                 const struct nf_conntrack_tuple *tuple)
 {
-        if (nla_put_be32(skb, CTA_IP_V4_SRC, tuple->src.u3.ip) ||
-            nla_put_be32(skb, CTA_IP_V4_DST, tuple->dst.u3.ip))
+        if (nla_put_in_addr(skb, CTA_IP_V4_SRC, tuple->src.u3.ip) ||
+            nla_put_in_addr(skb, CTA_IP_V4_DST, tuple->dst.u3.ip))
                 goto nla_put_failure;
         return 0;
 
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index be8703d02ef0..1f147204f1f3 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2319,11 +2319,11 @@ static int rt_fill_info(struct net *net,  __be32 dst, __be32 src,
         if (IPCB(skb)->flags & IPSKB_DOREDIRECT)
                 r->rtm_flags |= RTCF_DOREDIRECT;
 
-        if (nla_put_be32(skb, RTA_DST, dst))
+        if (nla_put_in_addr(skb, RTA_DST, dst))
                 goto nla_put_failure;
         if (src) {
                 r->rtm_src_len = 32;
-                if (nla_put_be32(skb, RTA_SRC, src))
+                if (nla_put_in_addr(skb, RTA_SRC, src))
                         goto nla_put_failure;
         }
         if (rt->dst.dev &&
@@ -2336,11 +2336,11 @@ static int rt_fill_info(struct net *net,  __be32 dst, __be32 src,
 #endif
         if (!rt_is_input_route(rt) &&
             fl4->saddr != src) {
-                if (nla_put_be32(skb, RTA_PREFSRC, fl4->saddr))
+                if (nla_put_in_addr(skb, RTA_PREFSRC, fl4->saddr))
                         goto nla_put_failure;
         }
         if (rt->rt_uses_gateway &&
-            nla_put_be32(skb, RTA_GATEWAY, rt->rt_gateway))
+            nla_put_in_addr(skb, RTA_GATEWAY, rt->rt_gateway))
                 goto nla_put_failure;
 
         expires = rt->dst.expires;
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
index f62c2c68ced0..32e36ea6bc0f 100644
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
@@ -786,19 +786,19 @@ static int tcp_metrics_fill_info(struct sk_buff *msg,
 
         switch (tm->tcpm_daddr.family) {
         case AF_INET:
-                if (nla_put_be32(msg, TCP_METRICS_ATTR_ADDR_IPV4,
-                                tm->tcpm_daddr.addr.a4) < 0)
+                if (nla_put_in_addr(msg, TCP_METRICS_ATTR_ADDR_IPV4,
+                                    tm->tcpm_daddr.addr.a4) < 0)
                         goto nla_put_failure;
-                if (nla_put_be32(msg, TCP_METRICS_ATTR_SADDR_IPV4,
-                                tm->tcpm_saddr.addr.a4) < 0)
+                if (nla_put_in_addr(msg, TCP_METRICS_ATTR_SADDR_IPV4,
+                                    tm->tcpm_saddr.addr.a4) < 0)
                         goto nla_put_failure;
                 break;
         case AF_INET6:
-                if (nla_put(msg, TCP_METRICS_ATTR_ADDR_IPV6, 16,
-                            tm->tcpm_daddr.addr.a6) < 0)
+                if (nla_put_in6_addr(msg, TCP_METRICS_ATTR_ADDR_IPV6,
+                                     &tm->tcpm_daddr.addr.in6) < 0)
                         goto nla_put_failure;
-                if (nla_put(msg, TCP_METRICS_ATTR_SADDR_IPV6, 16,
-                            tm->tcpm_saddr.addr.a6) < 0)
+                if (nla_put_in6_addr(msg, TCP_METRICS_ATTR_SADDR_IPV6,
+                                     &tm->tcpm_saddr.addr.in6) < 0)
                         goto nla_put_failure;
                 break;
         default: