summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <aahringo@redhat.com>2021-02-21 12:43:18 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-16 11:59:10 +0200
commit2caa7c2b225fde3b8e2f0d6d8134d4367028680a (patch)
tree586b6fa88b3a88d9d68ab51437a9b6b2c9ed55f6
parent8beeebc48f8499a4cde4de4ac541dcc1cd0ab862 (diff)
downloadlinux-stable-2caa7c2b225fde3b8e2f0d6d8134d4367028680a.tar.gz
linux-stable-2caa7c2b225fde3b8e2f0d6d8134d4367028680a.tar.bz2
linux-stable-2caa7c2b225fde3b8e2f0d6d8134d4367028680a.zip
net: ieee802154: fix nl802154 del llsec key
commit 37feaaf5ceb2245e474369312bb7b922ce7bce69 upstream. This patch fixes a nullpointer dereference if NL802154_ATTR_SEC_KEY is not set by the user. If this is the case nl802154 will return -EINVAL. Reported-by: syzbot+ac5c11d2959a8b3c4806@syzkaller.appspotmail.com Signed-off-by: Alexander Aring <aahringo@redhat.com> Link: https://lore.kernel.org/r/20210221174321.14210-1-aahringo@redhat.com Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/ieee802154/nl802154.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index d90a4ed5b8a0..71280f009bc7 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -1627,7 +1627,8 @@ static int nl802154_del_llsec_key(struct sk_buff *skb, struct genl_info *info)
struct nlattr *attrs[NL802154_KEY_ATTR_MAX + 1];
struct ieee802154_llsec_key_id id;
- if (nla_parse_nested(attrs, NL802154_KEY_ATTR_MAX,
+ if (!info->attrs[NL802154_ATTR_SEC_KEY] ||
+ nla_parse_nested(attrs, NL802154_KEY_ATTR_MAX,
info->attrs[NL802154_ATTR_SEC_KEY],
nl802154_key_policy))
return -EINVAL;