From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Alexander Aring <aahringo@redhat.com>,
syzbot+368672e0da240db53b5f@syzkaller.appspotmail.com,
Stefan Schmidt <stefan@datenfreihafen.org>,
Sasha Levin <sashal@kernel.org>,
linux-wpan@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 04/46] net: ieee802154: fix nl802154 del llsec devkey
Date: Mon, 12 Apr 2021 12:23:19 -0400 [thread overview]
Message-ID: <20210412162401.314035-4-sashal@kernel.org> (raw)
In-Reply-To: <20210412162401.314035-1-sashal@kernel.org>
From: Alexander Aring <aahringo@redhat.com>
[ Upstream commit 27c746869e1a135dffc2f2a80715bb7aa00445b4 ]
This patch fixes a nullpointer dereference if NL802154_ATTR_SEC_DEVKEY is
not set by the user. If this is the case nl802154 will return -EINVAL.
Reported-by: syzbot+368672e0da240db53b5f@syzkaller.appspotmail.com
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Link: https://lore.kernel.org/r/20210221174321.14210-4-aahringo@redhat.com
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
net/ieee802154/nl802154.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 3f6d86d63923..e9e4652cd592 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -1916,7 +1916,8 @@ static int nl802154_del_llsec_devkey(struct sk_buff *skb, struct genl_info *info
struct ieee802154_llsec_device_key key;
__le64 extended_addr;
- if (nla_parse_nested_deprecated(attrs, NL802154_DEVKEY_ATTR_MAX, info->attrs[NL802154_ATTR_SEC_DEVKEY], nl802154_devkey_policy, info->extack))
+ if (!info->attrs[NL802154_ATTR_SEC_DEVKEY] ||
+ nla_parse_nested_deprecated(attrs, NL802154_DEVKEY_ATTR_MAX, info->attrs[NL802154_ATTR_SEC_DEVKEY], nl802154_devkey_policy, info->extack))
return -EINVAL;
if (!attrs[NL802154_DEVKEY_ATTR_EXTENDED_ADDR])
--
2.30.2
next prev parent reply other threads:[~2021-04-12 16:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 16:23 [PATCH AUTOSEL 5.10 01/46] net: ieee802154: fix nl802154 del llsec key Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 02/46] net: ieee802154: fix nl802154 del llsec dev Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 03/46] net: ieee802154: fix nl802154 add llsec key Sasha Levin
2021-04-12 16:23 ` Sasha Levin [this message]
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 05/46] net: ieee802154: nl-mac: fix check on panid Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 18/46] drivers: net: fix memory leak in atusb_probe Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 24/46] net: ieee802154: forbid monitor for set llsec params Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 25/46] net: ieee802154: stop dump llsec keys for monitors Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 26/46] net: ieee802154: forbid monitor for add llsec key Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 27/46] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 28/46] net: ieee802154: stop dump llsec devs for monitors Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 29/46] net: ieee802154: forbid monitor for add llsec dev Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 30/46] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 31/46] net: ieee802154: stop dump llsec devkeys for monitors Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 32/46] net: ieee802154: forbid monitor for add llsec devkey Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 33/46] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 34/46] net: ieee802154: stop dump llsec seclevels for monitors Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 35/46] net: ieee802154: forbid monitor for add llsec seclevel Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 36/46] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 37/46] net: ieee802154: stop dump llsec params for monitors Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 38/46] net: mac802154: Fix general protection fault Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210412162401.314035-4-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=aahringo@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wpan@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=stefan@datenfreihafen.org \
--cc=syzbot+368672e0da240db53b5f@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).