Unverified Commit cbb27a20 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8574 net: ieee802154: fix null deref in parse dev addr 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Mingrui <liumingrui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YDFYF44ORZUNORCBKHZNVZKNEPYNHRMH/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9R4JK 
 
Link:https://gitee.com/openeuler/kernel/pulls/8574

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 745a3c56 d265ae7f

net/ieee802154/nl802154.c

+5 −4
Original line number Diff line number Diff line
@@ -1310,19 +1310,20 @@ ieee802154_llsec_parse_dev_addr(struct nlattr *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: