Commit 8cb08174 authored Apr 26, 2019 by Johannes Berg Committed by David S. Miller Apr 27, 2019

netlink: make validation more configurable for future strictness



We currently have two levels of strict validation:

 1) liberal (default)
     - undefined (type >= max) & NLA_UNSPEC attributes accepted
     - attribute length >= expected accepted
     - garbage at end of message accepted
 2) strict (opt-in)
     - NLA_UNSPEC attributes accepted
     - attribute length >= expected accepted

Split out parsing strictness into four different options:
 * TRAILING     - check that there's no trailing data after parsing
                  attributes (in message or nested)
 * MAXTYPE      - reject attrs > max known type
 * UNSPEC       - reject attributes with NLA_UNSPEC policy entries
 * STRICT_ATTRS - strictly validate attribute size

The default for future things should be *everything*.
The current *_strict() is a combination of TRAILING and MAXTYPE,
and is renamed to _deprecated_strict().
The current regular parsing has none of this, and is renamed to
*_parse_deprecated().

Additionally it allows us to selectively set one of the new flags
even on old policies. Notably, the UNSPEC flag could be useful in
this case, since it can be arranged (by filling in the policy) to
not be an incompatible userspace ABI change, but would then going
forward prevent forgetting attribute entries. Similar can apply
to the POLICY flag.

We end up with the following renames:
 * nla_parse           -> nla_parse_deprecated
 * nla_parse_strict    -> nla_parse_deprecated_strict
 * nlmsg_parse         -> nlmsg_parse_deprecated
 * nlmsg_parse_strict  -> nlmsg_parse_deprecated_strict
 * nla_parse_nested    -> nla_parse_nested_deprecated
 * nla_validate_nested -> nla_validate_nested_deprecated

Using spatch, of course:
    @@
    expression TB, MAX, HEAD, LEN, POL, EXT;
    @@
    -nla_parse(TB, MAX, HEAD, LEN, POL, EXT)
    +nla_parse_deprecated(TB, MAX, HEAD, LEN, POL, EXT)

    @@
    expression NLH, HDRLEN, TB, MAX, POL, EXT;
    @@
    -nlmsg_parse(NLH, HDRLEN, TB, MAX, POL, EXT)
    +nlmsg_parse_deprecated(NLH, HDRLEN, TB, MAX, POL, EXT)

    @@
    expression NLH, HDRLEN, TB, MAX, POL, EXT;
    @@
    -nlmsg_parse_strict(NLH, HDRLEN, TB, MAX, POL, EXT)
    +nlmsg_parse_deprecated_strict(NLH, HDRLEN, TB, MAX, POL, EXT)

    @@
    expression TB, MAX, NLA, POL, EXT;
    @@
    -nla_parse_nested(TB, MAX, NLA, POL, EXT)
    +nla_parse_nested_deprecated(TB, MAX, NLA, POL, EXT)

    @@
    expression START, MAX, POL, EXT;
    @@
    -nla_validate_nested(START, MAX, POL, EXT)
    +nla_validate_nested_deprecated(START, MAX, POL, EXT)

    @@
    expression NLH, HDRLEN, MAX, POL, EXT;
    @@
    -nlmsg_validate(NLH, HDRLEN, MAX, POL, EXT)
    +nlmsg_validate_deprecated(NLH, HDRLEN, MAX, POL, EXT)

For this patch, don't actually add the strict, non-renamed versions
yet so that it breaks compile if I get it wrong.

Also, while at it, make nla_validate and nla_parse go down to a
common __nla_validate_parse() function to avoid code duplication.

Ultimately, this allows us to have very strict validation for every
new caller of nla_parse()/nlmsg_parse() etc as re-introduced in the
next patch, while existing things will continue to work as is.

In effect then, this adds fully strict validation for any new command.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6f455f5f

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -1797,8 +1797,10 @@ static int nbd_genl_connect(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;
		@@ -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;

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";