net: mpls: netconf: perform strict checks also for doit handlers (0c4056ee) · Commits · 戴 / test

net/mpls/af_mpls.c

+39 −3

Original line number	Diff line number	Diff line
		@@ -1209,21 +1209,57 @@ static const struct nla_policy devconf_mpls_policy[NETCONFA_MAX + 1] = {
		[NETCONFA_IFINDEX] = { .len = sizeof(int) },
		};

		static int mpls_netconf_valid_get_req(struct sk_buff *skb,
		const struct nlmsghdr *nlh,
		struct nlattr **tb,
		struct netlink_ext_ack *extack)
		{
		int i, err;

		if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(struct netconfmsg))) {
		NL_SET_ERR_MSG_MOD(extack,
		"Invalid header for netconf get request");
		return -EINVAL;
		}

		if (!netlink_strict_get_check(skb))
		return nlmsg_parse(nlh, sizeof(struct netconfmsg), tb,
		NETCONFA_MAX, devconf_mpls_policy, extack);

		err = nlmsg_parse_strict(nlh, sizeof(struct netconfmsg), tb,
		NETCONFA_MAX, devconf_mpls_policy, extack);
		if (err)
		return err;

		for (i = 0; i <= NETCONFA_MAX; i++) {
		if (!tb[i])
		continue;

		switch (i) {
		case NETCONFA_IFINDEX:
		break;
		default:
		NL_SET_ERR_MSG_MOD(extack, "Unsupported attribute in netconf get request");
		return -EINVAL;
		}
		}

		return 0;
		}

		static int mpls_netconf_get_devconf(struct sk_buff *in_skb,
		struct nlmsghdr *nlh,
		struct netlink_ext_ack *extack)
		{
		struct net *net = sock_net(in_skb->sk);
		struct nlattr *tb[NETCONFA_MAX + 1];
		struct netconfmsg *ncm;
		struct net_device *dev;
		struct mpls_dev *mdev;
		struct sk_buff *skb;
		int ifindex;
		int err;

		err = nlmsg_parse(nlh, sizeof(*ncm), tb, NETCONFA_MAX,
		devconf_mpls_policy, extack);
		err = mpls_netconf_valid_get_req(in_skb, nlh, tb, extack);
		if (err < 0)
		goto errout;