From: Dan Robertson <dan@dlrobertson.com>
To: Alexander Aring <alex.aring@gmail.com>,
Stefan Schmidt <stefan@datenfreihafen.org>,
"David S . Miller" <davem@davemloft.net>,
linux-wpan@vger.kernel.org, netdev@vger.kernel.org
Cc: Dan Robertson <dan@dlrobertson.com>
Subject: [PATCH 2/2] net: ieee802154: fix null deref in parse key id
Date: Fri, 23 Apr 2021 00:02:14 -0400 [thread overview]
Message-ID: <20210423040214.15438-3-dan@dlrobertson.com> (raw)
In-Reply-To: <20210423040214.15438-1-dan@dlrobertson.com>
Fix a logic error that could result in a null deref if the user does not
set the PAN ID but does set the address.
Signed-off-by: Dan Robertson <dan@dlrobertson.com>
---
net/ieee802154/nl-mac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
index 9c640d670ffe..66983c5d4d85 100644
--- a/net/ieee802154/nl-mac.c
+++ b/net/ieee802154/nl-mac.c
@@ -551,7 +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] &&
+ if (!info->attrs[IEEE802154_ATTR_PAN_ID] ||
!(info->attrs[IEEE802154_ATTR_SHORT_ADDR] ||
info->attrs[IEEE802154_ATTR_HW_ADDR]))
return -EINVAL;
--
2.31.1
next prev parent reply other threads:[~2021-04-23 4:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 4:02 [PATCH 0/2] net: ieee802154: fix logic errors Dan Robertson
2021-04-23 4:02 ` [PATCH 1/2] net: ieee802154: fix null deref in parse dev addr Dan Robertson
2021-04-23 13:25 ` Alexander Aring
2021-04-23 15:10 ` Stefan Schmidt
2021-04-23 4:02 ` Dan Robertson [this message]
2021-04-23 13:28 ` [PATCH 2/2] net: ieee802154: fix null deref in parse key id Alexander Aring
2021-04-23 14:35 ` Dan Robertson
2021-04-23 14:59 ` Stefan Schmidt
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=20210423040214.15438-3-dan@dlrobertson.com \
--to=dan@dlrobertson.com \
--cc=alex.aring@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-wpan@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stefan@datenfreihafen.org \
/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).