Commit 67b61f6c authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

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

drivers/net/vxlan.c

+7 −9
Original line number Diff line number Diff line
@@ -171,11 +171,11 @@ static inline bool vxlan_addr_multicast(const union vxlan_addr *ipa) 
static int vxlan_nla_get_addr(union vxlan_addr *ip, struct nlattr *nla)

{

	if (nla_len(nla) >= sizeof(struct in6_addr)) {

		nla_memcpy(&ip->sin6.sin6_addr, nla, sizeof(struct in6_addr));

		ip->sin6.sin6_addr = nla_get_in6_addr(nla);

		ip->sa.sa_family = AF_INET6;

		return 0;

	} else if (nla_len(nla) >= sizeof(__be32)) {

		ip->sin.sin_addr.s_addr = nla_get_be32(nla);

		ip->sin.sin_addr.s_addr = nla_get_in_addr(nla);

		ip->sa.sa_family = AF_INET;

		return 0;

	} else {
@@ -215,7 +215,7 @@ static int vxlan_nla_get_addr(union vxlan_addr *ip, struct nlattr *nla) 
	if (nla_len(nla) >= sizeof(struct in6_addr)) {

		return -EAFNOSUPPORT;

	} else if (nla_len(nla) >= sizeof(__be32)) {

		ip->sin.sin_addr.s_addr = nla_get_be32(nla);

		ip->sin.sin_addr.s_addr = nla_get_in_addr(nla);

		ip->sa.sa_family = AF_INET;

		return 0;

	} else {
@@ -2602,27 +2602,25 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev, 
	/* Unless IPv6 is explicitly requested, assume IPv4 */

	dst->remote_ip.sa.sa_family = AF_INET;

	if (data[IFLA_VXLAN_GROUP]) {

		dst->remote_ip.sin.sin_addr.s_addr = nla_get_be32(data[IFLA_VXLAN_GROUP]);

		dst->remote_ip.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_GROUP]);

	} else if (data[IFLA_VXLAN_GROUP6]) {

		if (!IS_ENABLED(CONFIG_IPV6))

			return -EPFNOSUPPORT;



		nla_memcpy(&dst->remote_ip.sin6.sin6_addr, data[IFLA_VXLAN_GROUP6],

			   sizeof(struct in6_addr));

		dst->remote_ip.sin6.sin6_addr = nla_get_in6_addr(data[IFLA_VXLAN_GROUP6]);

		dst->remote_ip.sa.sa_family = AF_INET6;

		use_ipv6 = true;

	}



	if (data[IFLA_VXLAN_LOCAL]) {

		vxlan->saddr.sin.sin_addr.s_addr = nla_get_be32(data[IFLA_VXLAN_LOCAL]);

		vxlan->saddr.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_LOCAL]);

		vxlan->saddr.sa.sa_family = AF_INET;

	} else if (data[IFLA_VXLAN_LOCAL6]) {

		if (!IS_ENABLED(CONFIG_IPV6))

			return -EPFNOSUPPORT;



		/* TODO: respect scope id */

		nla_memcpy(&vxlan->saddr.sin6.sin6_addr, data[IFLA_VXLAN_LOCAL6],

			   sizeof(struct in6_addr));

		vxlan->saddr.sin6.sin6_addr = nla_get_in6_addr(data[IFLA_VXLAN_LOCAL6]);

		vxlan->saddr.sa.sa_family = AF_INET6;

		use_ipv6 = true;

	}

include/net/netlink.h

+21 −0
Original line number Diff line number Diff line
@@ -1127,6 +1127,27 @@ static inline unsigned long nla_get_msecs(const struct nlattr *nla) 
	return msecs_to_jiffies((unsigned long) msecs);

}



/**

 * nla_get_in_addr - return payload of IPv4 address attribute

 * @nla: IPv4 address netlink attribute

 */

static inline __be32 nla_get_in_addr(const struct nlattr *nla)

{

	return *(__be32 *) nla_data(nla);

}



/**

 * nla_get_in6_addr - return payload of IPv6 address attribute

 * @nla: IPv6 address netlink attribute

 */

static inline struct in6_addr nla_get_in6_addr(const struct nlattr *nla)

{

	struct in6_addr tmp;



	nla_memcpy(&tmp, nla, sizeof(tmp));

	return tmp;

}



/**

 * nla_nest_start - Start a new level of nested attributes

 * @skb: socket buffer to add attributes to

net/ipv4/devinet.c

+5 −5
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ static int inet_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh) 
	for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;

	     ifap = &ifa->ifa_next) {

		if (tb[IFA_LOCAL] &&

		    ifa->ifa_local != nla_get_be32(tb[IFA_LOCAL]))

		    ifa->ifa_local != nla_get_in_addr(tb[IFA_LOCAL]))

			continue;



		if (tb[IFA_LABEL] && nla_strcmp(tb[IFA_LABEL], ifa->ifa_label))
@@ -601,7 +601,7 @@ static int inet_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh) 


		if (tb[IFA_ADDRESS] &&

		    (ifm->ifa_prefixlen != ifa->ifa_prefixlen ||

		    !inet_ifa_match(nla_get_be32(tb[IFA_ADDRESS]), ifa)))

		    !inet_ifa_match(nla_get_in_addr(tb[IFA_ADDRESS]), ifa)))

			continue;



		if (ipv4_is_multicast(ifa->ifa_address))
@@ -791,11 +791,11 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh, 
	ifa->ifa_scope = ifm->ifa_scope;

	ifa->ifa_dev = in_dev;



	ifa->ifa_local = nla_get_be32(tb[IFA_LOCAL]);

	ifa->ifa_address = nla_get_be32(tb[IFA_ADDRESS]);

	ifa->ifa_local = nla_get_in_addr(tb[IFA_LOCAL]);

	ifa->ifa_address = nla_get_in_addr(tb[IFA_ADDRESS]);



	if (tb[IFA_BROADCAST])

		ifa->ifa_broadcast = nla_get_be32(tb[IFA_BROADCAST]);

		ifa->ifa_broadcast = nla_get_in_addr(tb[IFA_BROADCAST]);



	if (tb[IFA_LABEL])

		nla_strlcpy(ifa->ifa_label, tb[IFA_LABEL], IFNAMSIZ);

net/ipv4/fib_rules.c

+4 −4
Original line number Diff line number Diff line
@@ -194,10 +194,10 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb, 
	}



	if (frh->src_len)

		rule4->src = nla_get_be32(tb[FRA_SRC]);

		rule4->src = nla_get_in_addr(tb[FRA_SRC]);



	if (frh->dst_len)

		rule4->dst = nla_get_be32(tb[FRA_DST]);

		rule4->dst = nla_get_in_addr(tb[FRA_DST]);



#ifdef CONFIG_IP_ROUTE_CLASSID

	if (tb[FRA_FLOW]) {
@@ -260,10 +260,10 @@ static int fib4_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh, 
		return 0;

#endif



	if (frh->src_len && (rule4->src != nla_get_be32(tb[FRA_SRC])))

	if (frh->src_len && (rule4->src != nla_get_in_addr(tb[FRA_SRC])))

		return 0;



	if (frh->dst_len && (rule4->dst != nla_get_be32(tb[FRA_DST])))

	if (frh->dst_len && (rule4->dst != nla_get_in_addr(tb[FRA_DST])))

		return 0;



	return 1;

net/ipv4/fib_semantics.c

+2 −2
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh, 
			struct nlattr *nla, *attrs = rtnh_attrs(rtnh);



			nla = nla_find(attrs, attrlen, RTA_GATEWAY);

			nexthop_nh->nh_gw = nla ? nla_get_be32(nla) : 0;

			nexthop_nh->nh_gw = nla ? nla_get_in_addr(nla) : 0;

#ifdef CONFIG_IP_ROUTE_CLASSID

			nla = nla_find(attrs, attrlen, RTA_FLOW);

			nexthop_nh->nh_tclassid = nla ? nla_get_u32(nla) : 0;
@@ -523,7 +523,7 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info *fi) 
			struct nlattr *nla, *attrs = rtnh_attrs(rtnh);



			nla = nla_find(attrs, attrlen, RTA_GATEWAY);

			if (nla && nla_get_be32(nla) != nh->nh_gw)

			if (nla && nla_get_in_addr(nla) != nh->nh_gw)

				return 1;

#ifdef CONFIG_IP_ROUTE_CLASSID

			nla = nla_find(attrs, attrlen, RTA_FLOW);