diff options
| author | Alexander Aring <aahringo@redhat.com> | 2021-02-28 10:18:03 -0500 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2021-03-02 22:29:06 +0100 |
| commit | 6f7f657f24405f426212c09260bf7fe8a52cef33 (patch) | |
| tree | b07df7413cdd247c344a17392d1a59338b8a9cb9 /net/ieee802154 | |
| parent | 27c746869e1a135dffc2f2a80715bb7aa00445b4 (diff) | |
| download | linux-rpi-6f7f657f24405f426212c09260bf7fe8a52cef33.tar.gz linux-rpi-6f7f657f24405f426212c09260bf7fe8a52cef33.tar.bz2 linux-rpi-6f7f657f24405f426212c09260bf7fe8a52cef33.zip | |
net: ieee802154: nl-mac: fix check on panid
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@syzkaller.appspotmail.com
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Link: https://lore.kernel.org/r/20210228151817.95700-4-aahringo@redhat.com
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Diffstat (limited to 'net/ieee802154')
| -rw-r--r-- | net/ieee802154/nl-mac.c | 7 |
1 files 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]); } |