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>

1 files changed, 8 insertions, 6 deletions

diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
index b4e923f77954..a4f78d36bace 100644
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -376,15 +376,17 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 portid, u32 seq, int fla
         case L2TP_ENCAPTYPE_IP:
 #if IS_ENABLED(CONFIG_IPV6)
                 if (np) {
-                        if (nla_put(skb, L2TP_ATTR_IP6_SADDR, sizeof(np->saddr),
-                                    &np->saddr) ||
-                            nla_put(skb, L2TP_ATTR_IP6_DADDR, sizeof(sk->sk_v6_daddr),
-                                    &sk->sk_v6_daddr))
+                        if (nla_put_in6_addr(skb, L2TP_ATTR_IP6_SADDR,
+                                             &np->saddr) ||
+                            nla_put_in6_addr(skb, L2TP_ATTR_IP6_DADDR,
+                                             &sk->sk_v6_daddr))
                                 goto nla_put_failure;
                 } else
 #endif
-                if (nla_put_be32(skb, L2TP_ATTR_IP_SADDR, inet->inet_saddr) ||
-                    nla_put_be32(skb, L2TP_ATTR_IP_DADDR, inet->inet_daddr))
+                if (nla_put_in_addr(skb, L2TP_ATTR_IP_SADDR,
+                                    inet->inet_saddr) ||
+                    nla_put_in_addr(skb, L2TP_ATTR_IP_DADDR,
+                                    inet->inet_daddr))
                         goto nla_put_failure;
                 break;
         }