Phonet: Netlink factorization and cleanup

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com> Signed-off-by: David S. Miller <davem@davemloft.net>

Phonet: Netlink factorization and cleanup
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Rémi Denis-Courmont · David S. Miller
1 parent f0db275a81
Showing 1 changed file with 35 additions and 56 deletions Side-by-side Diff
net/phonet/pn_netlink.c
@@ -54,11 +54,16 @@
 		rtnl_set_sk_err(dev_net(dev), RTNLGRP_PHONET_IFADDR, err);
 }
  
-static int newaddr_doit(struct sk_buff *skb, struct nlmsghdr *nlm, void *attr)
+static const struct nla_policy ifa_phonet_policy[IFA_MAX+1] = {
+	[IFA_LOCAL] = { .type = NLA_U8 },
+};
+
+static int addr_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *attr)
 {
-	struct rtattr **rta = attr;
-	struct ifaddrmsg *ifm = NLMSG_DATA(nlm);
+	struct net *net = sock_net(skb->sk);
+	struct nlattr *tb[IFA_MAX+1];
 	struct net_device *dev;
+	struct ifaddrmsg *ifm;
 	int err;
 	u8 pnaddr;
  
  
  
  
  
  
@@ -67,52 +72,28 @@
  
 	ASSERT_RTNL();
  
-	if (rta[IFA_LOCAL - 1] == NULL)
-		return -EINVAL;
+	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_phonet_policy);
+	if (err < 0)
+		return err;
  
-	dev = __dev_get_by_index(&init_net, ifm->ifa_index);
-	if (dev == NULL)
-		return -ENODEV;
-
-	if (ifm->ifa_prefixlen > 0)
+	ifm = nlmsg_data(nlh);
+	if (tb[IFA_LOCAL] == NULL)
 		return -EINVAL;
-
-	memcpy(&pnaddr, RTA_DATA(rta[IFA_LOCAL - 1]), 1);
-
-	err = phonet_address_add(dev, pnaddr);
-	if (!err)
-		rtmsg_notify(RTM_NEWADDR, dev, pnaddr);
-	return err;
-}
-
-static int deladdr_doit(struct sk_buff *skb, struct nlmsghdr *nlm, void *attr)
-{
-	struct rtattr **rta = attr;
-	struct ifaddrmsg *ifm = NLMSG_DATA(nlm);
-	struct net_device *dev;
-	int err;
-	u8 pnaddr;
-
-	if (!capable(CAP_SYS_ADMIN))
-		return -EPERM;
-
-	ASSERT_RTNL();
-
-	if (rta[IFA_LOCAL - 1] == NULL)
+	pnaddr = nla_get_u8(tb[IFA_LOCAL]);
+	if (pnaddr & 3)
+		/* Phonet addresses only have 6 high-order bits */
 		return -EINVAL;
  
-	dev = __dev_get_by_index(&init_net, ifm->ifa_index);
+	dev = __dev_get_by_index(net, ifm->ifa_index);
 	if (dev == NULL)
 		return -ENODEV;
  
-	if (ifm->ifa_prefixlen > 0)
-		return -EADDRNOTAVAIL;
-
-	memcpy(&pnaddr, RTA_DATA(rta[IFA_LOCAL - 1]), 1);
-
-	err = phonet_address_del(dev, pnaddr);
+	if (nlh->nlmsg_type == RTM_NEWADDR)
+		err = phonet_address_add(dev, pnaddr);
+	else
+		err = phonet_address_del(dev, pnaddr);
 	if (!err)
-		rtmsg_notify(RTM_DELADDR, dev, pnaddr);
+		rtmsg_notify(nlh->nlmsg_type, dev, pnaddr);
 	return err;
 }
  
  
  
  
  
@@ -121,25 +102,23 @@
 {
 	struct ifaddrmsg *ifm;
 	struct nlmsghdr *nlh;
-	unsigned int orig_len = skb->len;
  
-	nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(struct ifaddrmsg));
-	ifm = NLMSG_DATA(nlh);
+	nlh = nlmsg_put(skb, pid, seq, event, sizeof(*ifm), 0);
+	if (nlh == NULL)
+		return -EMSGSIZE;
+
+	ifm = nlmsg_data(nlh);
 	ifm->ifa_family = AF_PHONET;
 	ifm->ifa_prefixlen = 0;
 	ifm->ifa_flags = IFA_F_PERMANENT;
-	ifm->ifa_scope = RT_SCOPE_HOST;
+	ifm->ifa_scope = RT_SCOPE_LINK;
 	ifm->ifa_index = dev->ifindex;
-	RTA_PUT(skb, IFA_LOCAL, 1, &addr);
-	nlh->nlmsg_len = skb->len - orig_len;
+	NLA_PUT_U8(skb, IFA_LOCAL, addr);
+	return nlmsg_end(skb, nlh);
  
-	return 0;
-
-nlmsg_failure:
-rtattr_failure:
-	skb_trim(skb, orig_len);
-
-	return -1;
+nla_put_failure:
+	nlmsg_cancel(skb, nlh);
+	return -EMSGSIZE;
 }
  
 static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
@@ -180,8 +159,8 @@
  
 void __init phonet_netlink_register(void)
 {
-	rtnl_register(PF_PHONET, RTM_NEWADDR, newaddr_doit, NULL);
-	rtnl_register(PF_PHONET, RTM_DELADDR, deladdr_doit, NULL);
+	rtnl_register(PF_PHONET, RTM_NEWADDR, addr_doit, NULL);
+	rtnl_register(PF_PHONET, RTM_DELADDR, addr_doit, NULL);
 	rtnl_register(PF_PHONET, RTM_GETADDR, NULL, getaddr_dumpit);
 }
...	...	@@ -54,11 +54,16 @@
54	54	rtnl_set_sk_err(dev_net(dev), RTNLGRP_PHONET_IFADDR, err);
55	55	}
56	56
57		-static int newaddr_doit(struct sk_buff skb, struct nlmsghdr nlm, void *attr)
	57	+static const struct nla_policy ifa_phonet_policy[IFA_MAX+1] = {
	58	+ [IFA_LOCAL] = { .type = NLA_U8 },
	59	+};
	60	+
	61	+static int addr_doit(struct sk_buff skb, struct nlmsghdr nlh, void *attr)
58	62	{
59		- struct rtattr **rta = attr;
60		- struct ifaddrmsg *ifm = NLMSG_DATA(nlm);
	63	+ struct net *net = sock_net(skb->sk);
	64	+ struct nlattr *tb[IFA_MAX+1];
61	65	struct net_device *dev;
	66	+ struct ifaddrmsg *ifm;
62	67	int err;
63	68	u8 pnaddr;
64	69
65	70
66	71
67	72
68	73
69	74
...	...	@@ -67,52 +72,28 @@
67	72
68	73	ASSERT_RTNL();
69	74
70		- if (rta[IFA_LOCAL - 1] == NULL)
71		- return -EINVAL;
	75	+ err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_phonet_policy);
	76	+ if (err < 0)
	77	+ return err;
72	78
73		- dev = __dev_get_by_index(&init_net, ifm->ifa_index);
74		- if (dev == NULL)
75		- return -ENODEV;
76		-
77		- if (ifm->ifa_prefixlen > 0)
	79	+ ifm = nlmsg_data(nlh);
	80	+ if (tb[IFA_LOCAL] == NULL)
78	81	return -EINVAL;
79		-
80		- memcpy(&pnaddr, RTA_DATA(rta[IFA_LOCAL - 1]), 1);
81		-
82		- err = phonet_address_add(dev, pnaddr);
83		- if (!err)
84		- rtmsg_notify(RTM_NEWADDR, dev, pnaddr);
85		- return err;
86		-}
87		-
88		-static int deladdr_doit(struct sk_buff skb, struct nlmsghdr nlm, void *attr)
89		-{
90		- struct rtattr **rta = attr;
91		- struct ifaddrmsg *ifm = NLMSG_DATA(nlm);
92		- struct net_device *dev;
93		- int err;
94		- u8 pnaddr;
95		-
96		- if (!capable(CAP_SYS_ADMIN))
97		- return -EPERM;
98		-
99		- ASSERT_RTNL();
100		-
101		- if (rta[IFA_LOCAL - 1] == NULL)
	82	+ pnaddr = nla_get_u8(tb[IFA_LOCAL]);
	83	+ if (pnaddr & 3)
	84	+ /* Phonet addresses only have 6 high-order bits */
102	85	return -EINVAL;
103	86
104		- dev = __dev_get_by_index(&init_net, ifm->ifa_index);
	87	+ dev = __dev_get_by_index(net, ifm->ifa_index);
105	88	if (dev == NULL)
106	89	return -ENODEV;
107	90
108		- if (ifm->ifa_prefixlen > 0)
109		- return -EADDRNOTAVAIL;
110		-
111		- memcpy(&pnaddr, RTA_DATA(rta[IFA_LOCAL - 1]), 1);
112		-
113		- err = phonet_address_del(dev, pnaddr);
	91	+ if (nlh->nlmsg_type == RTM_NEWADDR)
	92	+ err = phonet_address_add(dev, pnaddr);
	93	+ else
	94	+ err = phonet_address_del(dev, pnaddr);
114	95	if (!err)
115		- rtmsg_notify(RTM_DELADDR, dev, pnaddr);
	96	+ rtmsg_notify(nlh->nlmsg_type, dev, pnaddr);
116	97	return err;
117	98	}
118	99
119	100
120	101
121	102
122	103
...	...	@@ -121,25 +102,23 @@
121	102	{
122	103	struct ifaddrmsg *ifm;
123	104	struct nlmsghdr *nlh;
124		- unsigned int orig_len = skb->len;
125	105
126		- nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(struct ifaddrmsg));
127		- ifm = NLMSG_DATA(nlh);
	106	+ nlh = nlmsg_put(skb, pid, seq, event, sizeof(*ifm), 0);
	107	+ if (nlh == NULL)
	108	+ return -EMSGSIZE;
	109	+
	110	+ ifm = nlmsg_data(nlh);
128	111	ifm->ifa_family = AF_PHONET;
129	112	ifm->ifa_prefixlen = 0;
130	113	ifm->ifa_flags = IFA_F_PERMANENT;
131		- ifm->ifa_scope = RT_SCOPE_HOST;
	114	+ ifm->ifa_scope = RT_SCOPE_LINK;
132	115	ifm->ifa_index = dev->ifindex;
133		- RTA_PUT(skb, IFA_LOCAL, 1, &addr);
134		- nlh->nlmsg_len = skb->len - orig_len;
	116	+ NLA_PUT_U8(skb, IFA_LOCAL, addr);
	117	+ return nlmsg_end(skb, nlh);
135	118
136		- return 0;
137		-
138		-nlmsg_failure:
139		-rtattr_failure:
140		- skb_trim(skb, orig_len);
141		-
142		- return -1;
	119	+nla_put_failure:
	120	+ nlmsg_cancel(skb, nlh);
	121	+ return -EMSGSIZE;
143	122	}
144	123
145	124	static int getaddr_dumpit(struct sk_buff skb, struct netlink_callback cb)
...	...	@@ -180,8 +159,8 @@
180	159
181	160	void __init phonet_netlink_register(void)
182	161	{
183		- rtnl_register(PF_PHONET, RTM_NEWADDR, newaddr_doit, NULL);
184		- rtnl_register(PF_PHONET, RTM_DELADDR, deladdr_doit, NULL);
	162	+ rtnl_register(PF_PHONET, RTM_NEWADDR, addr_doit, NULL);
	163	+ rtnl_register(PF_PHONET, RTM_DELADDR, addr_doit, NULL);
185	164	rtnl_register(PF_PHONET, RTM_GETADDR, NULL, getaddr_dumpit);
186	165	}