Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5983b9de authored by Alexander Aring's avatar Alexander Aring Committed by Greg Kroah-Hartman
Browse files

net: ieee802154: nl-mac: fix check on panid 



commit 6f7f657f24405f426212c09260bf7fe8a52cef33 upstream.

This patch fixes a null pointer derefence for panid handle by move the
check for the netlink variable directly before accessing them.

Reported-by: default avatar <syzbot+d4c07de0144f6f63be3a@syzkaller.appspotmail.com>
Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Link: https://lore.kernel.org/r/20210228151817.95700-4-aahringo@redhat.com


Signed-off-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c166c0f5

net/ieee802154/nl-mac.c

+4 −3
Original line number Diff line number Diff line
@@ -559,9 +559,7 @@ ieee802154_llsec_parse_key_id(struct genl_info *info, 
	desc->mode = nla_get_u8(info->attrs[IEEE802154_ATTR_LLSEC_KEY_MODE]);



	if (desc->mode == IEEE802154_SCF_KEY_IMPLICIT) {

		if (!info->attrs[IEEE802154_ATTR_PAN_ID] &&

		    !(info->attrs[IEEE802154_ATTR_SHORT_ADDR] ||

		      info->attrs[IEEE802154_ATTR_HW_ADDR]))

		if (!info->attrs[IEEE802154_ATTR_PAN_ID])

			return -EINVAL;



		desc->device_addr.pan_id = nla_get_shortaddr(info->attrs[IEEE802154_ATTR_PAN_ID]);
@@ -570,6 +568,9 @@ ieee802154_llsec_parse_key_id(struct genl_info *info, 
			desc->device_addr.mode = IEEE802154_ADDR_SHORT;

			desc->device_addr.short_addr = nla_get_shortaddr(info->attrs[IEEE802154_ATTR_SHORT_ADDR]);

		} else {

			if (!info->attrs[IEEE802154_ATTR_HW_ADDR])

				return -EINVAL;



			desc->device_addr.mode = IEEE802154_ADDR_LONG;

			desc->device_addr.extended_addr = nla_get_hwaddr(info->attrs[IEEE802154_ATTR_HW_ADDR]);

		}