Commit 84ee9164 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'strict-netlink-validation' 



Johannes Berg says:

====================
strict netlink validation

Here's a respin, with the following changes:
 * change message when rejecting unknown attribute types (David Ahern)
 * drop nl80211 patch - I'll apply it separately
 * remove NL_VALIDATE_POLICY - we have a lot of calls to nla_parse()
   that really should be without a policy as it has previously been
   validated - need to find a good way to handle this later
 * include the correct generic netlink change (d'oh, sorry)
====================

Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f6ad55a6 ef6243ac

crypto/crypto_user_base.c

+2 −2
Original line number Diff line number Diff line
@@ -465,8 +465,8 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, 
		return err;

	}



	err = nlmsg_parse(nlh, crypto_msg_min[type], attrs, CRYPTOCFGA_MAX,

			  crypto_policy, extack);

	err = nlmsg_parse_deprecated(nlh, crypto_msg_min[type], attrs,

				     CRYPTOCFGA_MAX, crypto_policy, extack);

	if (err < 0)

		return err;

drivers/block/drbd/drbd_nla.c

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ int drbd_nla_parse_nested(struct nlattr *tb[], int maxtype, struct nlattr *nla, 


	err = drbd_nla_check_mandatory(maxtype, nla);

	if (!err)

		err = nla_parse_nested(tb, maxtype, nla, policy, NULL);

		err = nla_parse_nested_deprecated(tb, maxtype, nla, policy,

						  NULL);



	return err;

}

drivers/block/nbd.c

+12 −4
Original line number Diff line number Diff line
@@ -1797,8 +1797,10 @@ again: 
				ret = -EINVAL;

				goto out;

			}

			ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,

					       nbd_sock_policy, info->extack);

			ret = nla_parse_nested_deprecated(socks, NBD_SOCK_MAX,

							  attr,

							  nbd_sock_policy,

							  info->extack);

			if (ret != 0) {

				printk(KERN_ERR "nbd: error processing sock list\n");

				ret = -EINVAL;
@@ -1968,8 +1970,10 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info) 
				ret = -EINVAL;

				goto out;

			}

			ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,

					       nbd_sock_policy, info->extack);

			ret = nla_parse_nested_deprecated(socks, NBD_SOCK_MAX,

							  attr,

							  nbd_sock_policy,

							  info->extack);

			if (ret != 0) {

				printk(KERN_ERR "nbd: error processing sock list\n");

				ret = -EINVAL;
@@ -1999,18 +2003,22 @@ out: 
static const struct genl_ops nbd_connect_genl_ops[] = {

	{

		.cmd	= NBD_CMD_CONNECT,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit	= nbd_genl_connect,

	},

	{

		.cmd	= NBD_CMD_DISCONNECT,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit	= nbd_genl_disconnect,

	},

	{

		.cmd	= NBD_CMD_RECONFIGURE,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit	= nbd_genl_reconfigure,

	},

	{

		.cmd	= NBD_CMD_STATUS,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit	= nbd_genl_status,

	},

};

drivers/infiniband/core/addr.c

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static inline bool ib_nl_is_good_ip_resp(const struct nlmsghdr *nlh) 
	if (nlh->nlmsg_flags & RDMA_NL_LS_F_ERR)

		return false;



	ret = nla_parse(tb, LS_NLA_TYPE_MAX - 1, nlmsg_data(nlh),

	ret = nla_parse_deprecated(tb, LS_NLA_TYPE_MAX - 1, nlmsg_data(nlh),

				   nlmsg_len(nlh), ib_nl_addr_policy, NULL);

	if (ret)

		return false;

drivers/infiniband/core/iwpm_util.c

+4 −4
Original line number Diff line number Diff line
@@ -506,13 +506,13 @@ int iwpm_parse_nlmsg(struct netlink_callback *cb, int policy_max, 
	int ret;

	const char *err_str = "";



	ret = nlmsg_validate(cb->nlh, nlh_len, policy_max - 1, nlmsg_policy,

			     NULL);

	ret = nlmsg_validate_deprecated(cb->nlh, nlh_len, policy_max - 1,

					nlmsg_policy, NULL);

	if (ret) {

		err_str = "Invalid attribute";

		goto parse_nlmsg_error;

	}

	ret = nlmsg_parse(cb->nlh, nlh_len, nltb, policy_max - 1,

	ret = nlmsg_parse_deprecated(cb->nlh, nlh_len, nltb, policy_max - 1,

				     nlmsg_policy, NULL);

	if (ret) {

		err_str = "Unable to parse the nlmsg";

CRA Git | Maintained and supported by SUSTech CRA and CCSE