netdev - Re: [PATCH wpan 03/17] net: ieee802154: nl-mac: fix check on panid

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 2 Mar 2021 22:33:17 +0100
From:   Stefan Schmidt <stefan@...enfreihafen.org>
To:     Alexander Aring <aahringo@...hat.com>
Cc:     linux-wpan@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH wpan 03/17] net: ieee802154: nl-mac: fix check on panid

Hello.

On 28.02.21 16:18, Alexander Aring wrote:
> This patch fixes a null pointer derefence for panid handle by move the
> check for the netlink variable directly before accessing them.
> 
> Reported-by: syzbot+d4c07de0144f6f63be3a@...kaller.appspotmail.com
> Signed-off-by: Alexander Aring <aahringo@...hat.com>
> ---
>   net/ieee802154/nl-mac.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
> index 9c640d670ffe..0c1b0770c59e 100644
> --- a/net/ieee802154/nl-mac.c
> +++ b/net/ieee802154/nl-mac.c
> @@ -551,9 +551,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]);
> @@ -562,6 +560,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]);
>   		}
> 

This patch has been applied to the wpan tree and will be
part of the next pull request to net. Thanks!

regards
Stefan Schmidt