Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 930345ea authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

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: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15e318bd

drivers/net/vxlan.c

+11 −11
Original line number Diff line number Diff line
@@ -187,9 +187,9 @@ static int vxlan_nla_put_addr(struct sk_buff *skb, int attr, 
			      const union vxlan_addr *ip)

{

	if (ip->sa.sa_family == AF_INET6)

		return nla_put(skb, attr, sizeof(struct in6_addr), &ip->sin6.sin6_addr);

		return nla_put_in6_addr(skb, attr, &ip->sin6.sin6_addr);

	else

		return nla_put_be32(skb, attr, ip->sin.sin_addr.s_addr);

		return nla_put_in_addr(skb, attr, ip->sin.sin_addr.s_addr);

}



#else /* !CONFIG_IPV6 */
@@ -226,7 +226,7 @@ static int vxlan_nla_get_addr(union vxlan_addr *ip, struct nlattr *nla) 
static int vxlan_nla_put_addr(struct sk_buff *skb, int attr,

			      const union vxlan_addr *ip)

{

	return nla_put_be32(skb, attr, ip->sin.sin_addr.s_addr);

	return nla_put_in_addr(skb, attr, ip->sin.sin_addr.s_addr);

}

#endif
@@ -2807,12 +2807,12 @@ static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev) 


	if (!vxlan_addr_any(&dst->remote_ip)) {

		if (dst->remote_ip.sa.sa_family == AF_INET) {

			if (nla_put_be32(skb, IFLA_VXLAN_GROUP,

			if (nla_put_in_addr(skb, IFLA_VXLAN_GROUP,

					    dst->remote_ip.sin.sin_addr.s_addr))

				goto nla_put_failure;

#if IS_ENABLED(CONFIG_IPV6)

		} else {

			if (nla_put(skb, IFLA_VXLAN_GROUP6, sizeof(struct in6_addr),

			if (nla_put_in6_addr(skb, IFLA_VXLAN_GROUP6,

					     &dst->remote_ip.sin6.sin6_addr))

				goto nla_put_failure;

#endif
@@ -2824,12 +2824,12 @@ static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev) 


	if (!vxlan_addr_any(&vxlan->saddr)) {

		if (vxlan->saddr.sa.sa_family == AF_INET) {

			if (nla_put_be32(skb, IFLA_VXLAN_LOCAL,

			if (nla_put_in_addr(skb, IFLA_VXLAN_LOCAL,

					    vxlan->saddr.sin.sin_addr.s_addr))

				goto nla_put_failure;

#if IS_ENABLED(CONFIG_IPV6)

		} else {

			if (nla_put(skb, IFLA_VXLAN_LOCAL6, sizeof(struct in6_addr),

			if (nla_put_in6_addr(skb, IFLA_VXLAN_LOCAL6,

					     &vxlan->saddr.sin6.sin6_addr))

				goto nla_put_failure;

#endif

include/linux/netfilter/ipset/ip_set.h

+2 −3
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static inline int nla_put_ipaddr4(struct sk_buff *skb, int type, __be32 ipaddr) 


	if (!__nested)

		return -EMSGSIZE;

	ret = nla_put_net32(skb, IPSET_ATTR_IPADDR_IPV4, ipaddr);

	ret = nla_put_in_addr(skb, IPSET_ATTR_IPADDR_IPV4, ipaddr);

	if (!ret)

		ipset_nest_end(skb, __nested);

	return ret;
@@ -497,8 +497,7 @@ static inline int nla_put_ipaddr6(struct sk_buff *skb, int type, 


	if (!__nested)

		return -EMSGSIZE;

	ret = nla_put(skb, IPSET_ATTR_IPADDR_IPV6,

		      sizeof(struct in6_addr), ipaddrptr);

	ret = nla_put_in6_addr(skb, IPSET_ATTR_IPADDR_IPV6, ipaddrptr);

	if (!ret)

		ipset_nest_end(skb, __nested);

	return ret;

include/net/netlink.h

+29 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/types.h>

#include <linux/netlink.h>

#include <linux/jiffies.h>

#include <linux/in6.h>



/* ========================================================================

 *         Netlink Messages and Attributes Interface (As Seen On TV)
@@ -105,6 +106,8 @@ 
 *   nla_put_string(skb, type, str)	add string attribute to skb

 *   nla_put_flag(skb, type)		add flag attribute to skb

 *   nla_put_msecs(skb, type, jiffies)	add msecs attribute to skb

 *   nla_put_in_addr(skb, type, addr)	add IPv4 address attribute to skb

 *   nla_put_in6_addr(skb, type, addr)	add IPv6 address attribute to skb

 *

 * Nested Attributes Construction:

 *   nla_nest_start(skb, type)		start a nested attribute
@@ -956,6 +959,32 @@ static inline int nla_put_msecs(struct sk_buff *skb, int attrtype, 
	return nla_put(skb, attrtype, sizeof(u64), &tmp);

}



/**

 * nla_put_in_addr - Add an IPv4 address netlink attribute to a socket

 * buffer

 * @skb: socket buffer to add attribute to

 * @attrtype: attribute type

 * @addr: IPv4 address

 */

static inline int nla_put_in_addr(struct sk_buff *skb, int attrtype,

				  __be32 addr)

{

	return nla_put_be32(skb, attrtype, addr);

}



/**

 * nla_put_in6_addr - Add an IPv6 address netlink attribute to a socket

 * buffer

 * @skb: socket buffer to add attribute to

 * @attrtype: attribute type

 * @addr: IPv6 address

 */

static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype,

				   const struct in6_addr *addr)

{

	return nla_put(skb, attrtype, sizeof(*addr), addr);

}



/**

 * nla_get_u32 - return payload of u32 attribute

 * @nla: u32 netlink attribute

net/ipv4/devinet.c

+3 −3
Original line number Diff line number Diff line
@@ -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) ||

net/ipv4/fib_rules.c

+2 −2
Original line number Diff line number Diff line
@@ -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 &&