Commit 5176f91e authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[NETLINK]: Make use of NLA_STRING/NLA_NUL_STRING attribute validation 



Converts existing NLA_STRING attributes to use the new
validation features, saving a couple of temporary buffers.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a5531a5d

net/core/fib_rules.c

+1 −7
Original line number Diff line number Diff line
@@ -161,9 +161,6 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) 
	if (err < 0)

		goto errout;



	if (tb[FRA_IFNAME] && nla_len(tb[FRA_IFNAME]) > IFNAMSIZ)

		goto errout;



	rule = kzalloc(ops->rule_size, GFP_KERNEL);

	if (rule == NULL) {

		err = -ENOMEM;
@@ -177,10 +174,7 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) 
		struct net_device *dev;



		rule->ifindex = -1;

		if (nla_strlcpy(rule->ifname, tb[FRA_IFNAME],

				IFNAMSIZ) >= IFNAMSIZ)

			goto errout_free;



		nla_strlcpy(rule->ifname, tb[FRA_IFNAME], IFNAMSIZ);

		dev = __dev_get_by_name(rule->ifname);

		if (dev)

			rule->ifindex = dev->ifindex;

net/core/rtnetlink.c

+4 −5
Original line number Diff line number Diff line
@@ -371,8 +371,8 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) 
}



static struct nla_policy ifla_policy[IFLA_MAX+1] __read_mostly = {

	[IFLA_IFNAME]		= { .type = NLA_STRING },

	[IFLA_MAP]		= { .minlen = sizeof(struct rtnl_link_ifmap) },

	[IFLA_IFNAME]		= { .type = NLA_STRING, .len = IFNAMSIZ-1 },

	[IFLA_MAP]		= { .len = sizeof(struct rtnl_link_ifmap) },

	[IFLA_MTU]		= { .type = NLA_U32 },

	[IFLA_TXQLEN]		= { .type = NLA_U32 },

	[IFLA_WEIGHT]		= { .type = NLA_U32 },
@@ -392,9 +392,8 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) 
	if (err < 0)

		goto errout;



	if (tb[IFLA_IFNAME] &&

	    nla_strlcpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ) >= IFNAMSIZ)

		return -EINVAL;

	if (tb[IFLA_IFNAME])

		nla_strlcpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);



	err = -EINVAL;

	ifm = nlmsg_data(nlh);

net/decnet/dn_rules.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp, 
}



static struct nla_policy dn_fib_rule_policy[FRA_MAX+1] __read_mostly = {

	[FRA_IFNAME]	= { .type = NLA_STRING },

	[FRA_IFNAME]	= { .type = NLA_STRING, .len = IFNAMSIZ - 1 },

	[FRA_PRIORITY]	= { .type = NLA_U32 },

	[FRA_SRC]	= { .type = NLA_U16 },

	[FRA_DST]	= { .type = NLA_U16 },

net/ipv4/devinet.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static struct nla_policy ifa_ipv4_policy[IFA_MAX+1] __read_mostly = { 
	[IFA_ADDRESS]   	= { .type = NLA_U32 },

	[IFA_BROADCAST] 	= { .type = NLA_U32 },

	[IFA_ANYCAST]   	= { .type = NLA_U32 },

	[IFA_LABEL]     	= { .type = NLA_STRING },

	[IFA_LABEL]     	= { .type = NLA_STRING, .len = IFNAMSIZ - 1 },

};



static void rtmsg_ifa(int event, struct in_ifaddr *, struct nlmsghdr *, u32);

net/ipv4/fib_frontend.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ struct nla_policy rtm_ipv4_policy[RTA_MAX+1] __read_mostly = { 
	[RTA_PRIORITY]		= { .type = NLA_U32 },

	[RTA_PREFSRC]		= { .type = NLA_U32 },

	[RTA_METRICS]		= { .type = NLA_NESTED },

	[RTA_MULTIPATH]		= { .minlen = sizeof(struct rtnexthop) },

	[RTA_MULTIPATH]		= { .len = sizeof(struct rtnexthop) },

	[RTA_PROTOINFO]		= { .type = NLA_U32 },

	[RTA_FLOW]		= { .type = NLA_U32 },

	[RTA_MP_ALGO]		= { .type = NLA_U32 },