| From 20d5fe2d7103f5c43ad11a3d6d259e9d61165c35 Mon Sep 17 00:00:00 2001 |
| From: Alexander Aring <aahringo@redhat.com> |
| Date: Sun, 21 Feb 2021 12:43:20 -0500 |
| Subject: net: ieee802154: fix nl802154 add llsec key |
| |
| From: Alexander Aring <aahringo@redhat.com> |
| |
| commit 20d5fe2d7103f5c43ad11a3d6d259e9d61165c35 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+ce4e062c2d51977ddc50@syzkaller.appspotmail.com |
| Signed-off-by: Alexander Aring <aahringo@redhat.com> |
| Link: https://lore.kernel.org/r/20210221174321.14210-3-aahringo@redhat.com |
| Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/ieee802154/nl802154.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/net/ieee802154/nl802154.c |
| +++ b/net/ieee802154/nl802154.c |
| @@ -1544,7 +1544,8 @@ static int nl802154_add_llsec_key(struct |
| struct ieee802154_llsec_key_id id = { }; |
| u32 commands[NL802154_CMD_FRAME_NR_IDS / 32] = { }; |
| |
| - if (nla_parse_nested_deprecated(attrs, NL802154_KEY_ATTR_MAX, info->attrs[NL802154_ATTR_SEC_KEY], nl802154_key_policy, info->extack)) |
| + if (!info->attrs[NL802154_ATTR_SEC_KEY] || |
| + nla_parse_nested_deprecated(attrs, NL802154_KEY_ATTR_MAX, info->attrs[NL802154_ATTR_SEC_KEY], nl802154_key_policy, info->extack)) |
| return -EINVAL; |
| |
| if (!attrs[NL802154_KEY_ATTR_USAGE_FRAMES] || |
