netlink: implement nla_get_in_addr and nla_get_in6_addr

Those are counterparts to nla_put_in_addr and nla_put_in6_addr.

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

7 files changed, 15 insertions, 24 deletions

diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index d313bfd88512..61fb184b818d 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -199,12 +199,10 @@ static int fib6_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
         }
 
         if (frh->src_len)
-                nla_memcpy(&rule6->src.addr, tb[FRA_SRC],
-                           sizeof(struct in6_addr));
+                rule6->src.addr = nla_get_in6_addr(tb[FRA_SRC]);
 
         if (frh->dst_len)
-                nla_memcpy(&rule6->dst.addr, tb[FRA_DST],
-                           sizeof(struct in6_addr));
+                rule6->dst.addr = nla_get_in6_addr(tb[FRA_DST]);
 
         rule6->src.plen = frh->src_len;
         rule6->dst.plen = frh->dst_len;
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index f61f7ad2d045..0f4e73da14e4 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -1412,7 +1412,7 @@ static int ip6gre_tap_validate(struct nlattr *tb[], struct nlattr *data[])
                 goto out;
 
         if (data[IFLA_GRE_REMOTE]) {
-                nla_memcpy(&daddr, data[IFLA_GRE_REMOTE], sizeof(struct in6_addr));
+                daddr = nla_get_in6_addr(data[IFLA_GRE_REMOTE]);
                 if (ipv6_addr_any(&daddr))
                         return -EINVAL;
         }
@@ -1446,10 +1446,10 @@ static void ip6gre_netlink_parms(struct nlattr *data[],
                 parms->o_key = nla_get_be32(data[IFLA_GRE_OKEY]);
 
         if (data[IFLA_GRE_LOCAL])
-                nla_memcpy(&parms->laddr, data[IFLA_GRE_LOCAL], sizeof(struct in6_addr));
+                parms->laddr = nla_get_in6_addr(data[IFLA_GRE_LOCAL]);
 
         if (data[IFLA_GRE_REMOTE])
-                nla_memcpy(&parms->raddr, data[IFLA_GRE_REMOTE], sizeof(struct in6_addr));
+                parms->raddr = nla_get_in6_addr(data[IFLA_GRE_REMOTE]);
 
         if (data[IFLA_GRE_TTL])
                 parms->hop_limit = nla_get_u8(data[IFLA_GRE_TTL]);
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 80543d13ea7c..9bd85f0dff69 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1640,12 +1640,10 @@ static void ip6_tnl_netlink_parms(struct nlattr *data[],
                 parms->link = nla_get_u32(data[IFLA_IPTUN_LINK]);
 
         if (data[IFLA_IPTUN_LOCAL])
-                nla_memcpy(&parms->laddr, data[IFLA_IPTUN_LOCAL],
-                           sizeof(struct in6_addr));
+                parms->laddr = nla_get_in6_addr(data[IFLA_IPTUN_LOCAL]);
 
         if (data[IFLA_IPTUN_REMOTE])
-                nla_memcpy(&parms->raddr, data[IFLA_IPTUN_REMOTE],
-                           sizeof(struct in6_addr));
+                parms->raddr = nla_get_in6_addr(data[IFLA_IPTUN_REMOTE]);
 
         if (data[IFLA_IPTUN_TTL])
                 parms->hop_limit = nla_get_u8(data[IFLA_IPTUN_TTL]);
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 87a262b0f07b..53d90ed68905 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -897,12 +897,10 @@ static void vti6_netlink_parms(struct nlattr *data[],
                 parms->link = nla_get_u32(data[IFLA_VTI_LINK]);
 
         if (data[IFLA_VTI_LOCAL])
-                nla_memcpy(&parms->laddr, data[IFLA_VTI_LOCAL],
-                           sizeof(struct in6_addr));
+                parms->laddr = nla_get_in6_addr(data[IFLA_VTI_LOCAL]);
 
         if (data[IFLA_VTI_REMOTE])
-                nla_memcpy(&parms->raddr, data[IFLA_VTI_REMOTE],
-                           sizeof(struct in6_addr));
+                parms->raddr = nla_get_in6_addr(data[IFLA_VTI_REMOTE]);
 
         if (data[IFLA_VTI_IKEY])
                 parms->i_key = nla_get_be32(data[IFLA_VTI_IKEY]);
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index 78284a697439..fba91c6fc7ca 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -310,10 +310,8 @@ static int ipv6_nlattr_to_tuple(struct nlattr *tb[],
         if (!tb[CTA_IP_V6_SRC] || !tb[CTA_IP_V6_DST])
                 return -EINVAL;
 
-        memcpy(&t->src.u3.ip6, nla_data(tb[CTA_IP_V6_SRC]),
-               sizeof(u_int32_t) * 4);
-        memcpy(&t->dst.u3.ip6, nla_data(tb[CTA_IP_V6_DST]),
-               sizeof(u_int32_t) * 4);
+        t->src.u3.in6 = nla_get_in6_addr(tb[CTA_IP_V6_SRC]);
+        t->dst.u3.in6 = nla_get_in6_addr(tb[CTA_IP_V6_DST]);
 
         return 0;
 }
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 385e9bd4f218..5c48293ff062 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2438,7 +2438,7 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
         cfg->fc_nlinfo.nl_net = sock_net(skb->sk);
 
         if (tb[RTA_GATEWAY]) {
-                nla_memcpy(&cfg->fc_gateway, tb[RTA_GATEWAY], 16);
+                cfg->fc_gateway = nla_get_in6_addr(tb[RTA_GATEWAY]);
                 cfg->fc_flags |= RTF_GATEWAY;
         }
 
@@ -2461,7 +2461,7 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
         }
 
         if (tb[RTA_PREFSRC])
-                nla_memcpy(&cfg->fc_prefsrc, tb[RTA_PREFSRC], 16);
+                cfg->fc_prefsrc = nla_get_in6_addr(tb[RTA_PREFSRC]);
 
         if (tb[RTA_OIF])
                 cfg->fc_ifindex = nla_get_u32(tb[RTA_OIF]);
@@ -2519,7 +2519,7 @@ beginning:
 
                         nla = nla_find(attrs, attrlen, RTA_GATEWAY);
                         if (nla) {
-                                nla_memcpy(&r_cfg.fc_gateway, nla, 16);
+                                r_cfg.fc_gateway = nla_get_in6_addr(nla);
                                 r_cfg.fc_flags |= RTF_GATEWAY;
                         }
                 }
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 0e2bb538a556..e6b9f51b15e8 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1530,8 +1530,7 @@ static bool ipip6_netlink_6rd_parms(struct nlattr *data[],
 
         if (data[IFLA_IPTUN_6RD_PREFIX]) {
                 ret = true;
-                nla_memcpy(&ip6rd->prefix, data[IFLA_IPTUN_6RD_PREFIX],
-                           sizeof(struct in6_addr));
+                ip6rd->prefix = nla_get_in6_addr(data[IFLA_IPTUN_6RD_PREFIX]);
         }
 
         if (data[IFLA_IPTUN_6RD_RELAY_PREFIX]) {