Commit 9fdd0491 authored by Dan Robertson's avatar Dan Robertson Committed by Stefan Schmidt
Browse files

net: ieee802154: fix null deref in parse dev addr 



Fix a logic error that could result in a null deref if the user sets
the mode incorrectly for the given addr type.

Signed-off-by: default avatarDan Robertson <dan@dlrobertson.com>
Acked-by: default avatarAlexander Aring <aahringo@redhat.com>
Link: https://lore.kernel.org/r/20210423040214.15438-2-dan@dlrobertson.com


Signed-off-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
parent 8a12f883

net/ieee802154/nl802154.c

+5 −4
Original line number Diff line number Diff line
@@ -1298,19 +1298,20 @@ ieee802154_llsec_parse_dev_addr(struct nlattr *nla, 
	if (!nla || nla_parse_nested_deprecated(attrs, NL802154_DEV_ADDR_ATTR_MAX, nla, nl802154_dev_addr_policy, NULL))

		return -EINVAL;



	if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] ||

	    !attrs[NL802154_DEV_ADDR_ATTR_MODE] ||

	    !(attrs[NL802154_DEV_ADDR_ATTR_SHORT] ||

	      attrs[NL802154_DEV_ADDR_ATTR_EXTENDED]))

	if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] || !attrs[NL802154_DEV_ADDR_ATTR_MODE])

		return -EINVAL;



	addr->pan_id = nla_get_le16(attrs[NL802154_DEV_ADDR_ATTR_PAN_ID]);

	addr->mode = nla_get_u32(attrs[NL802154_DEV_ADDR_ATTR_MODE]);

	switch (addr->mode) {

	case NL802154_DEV_ADDR_SHORT:

		if (!attrs[NL802154_DEV_ADDR_ATTR_SHORT])

			return -EINVAL;

		addr->short_addr = nla_get_le16(attrs[NL802154_DEV_ADDR_ATTR_SHORT]);

		break;

	case NL802154_DEV_ADDR_EXTENDED:

		if (!attrs[NL802154_DEV_ADDR_ATTR_EXTENDED])

			return -EINVAL;

		addr->extended_addr = nla_get_le64(attrs[NL802154_DEV_ADDR_ATTR_EXTENDED]);

		break;

	default: