From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Alexander Aring <aahringo@redhat.com>,
syzbot+d4c07de0144f6f63be3a@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 05/46] net: ieee802154: nl-mac: fix check on panid
Date: Mon, 12 Apr 2021 12:23:20 -0400 [thread overview]
Message-ID: <20210412162401.314035-5-sashal@kernel.org> (raw)
In-Reply-To: <20210412162401.314035-1-sashal@kernel.org>
From: Alexander Aring <aahringo@redhat.com>
[ Upstream commit 6f7f657f24405f426212c09260bf7fe8a52cef33 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 6d091e419d3e..d19c40c684e8 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]);
}
--
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 ` [PATCH AUTOSEL 5.10 04/46] net: ieee802154: fix nl802154 del llsec devkey Sasha Levin
2021-04-12 16:23 ` Sasha Levin [this message]
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-5-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+d4c07de0144f6f63be3a@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).