linux-wpan.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexander Aring <aahringo@redhat.com>
To: stefan@datenfreihafen.org
Cc: linux-wpan@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH RESEND wpan 01/15] net: ieee802154: nl-mac: fix check on panid
Date: Sun,  4 Apr 2021 20:30:40 -0400	[thread overview]
Message-ID: <20210405003054.256017-2-aahringo@redhat.com> (raw)
In-Reply-To: <20210405003054.256017-1-aahringo@redhat.com>

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>
---
 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 9c640d670ffe..0c1b0770c59e 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.26.3


  reply	other threads:[~2021-04-05  0:31 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-05  0:30 [PATCH RESEND wpan 00/15] net: ieee802154: forbid sec params for monitors Alexander Aring
2021-04-05  0:30 ` Alexander Aring [this message]
2021-04-05  0:30 ` [PATCH RESEND wpan 02/15] net: ieee802154: forbid monitor for set llsec params Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 03/15] net: ieee802154: stop dump llsec keys for monitors Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 04/15] net: ieee802154: forbid monitor for add llsec key Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 05/15] net: ieee802154: forbid monitor for del " Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 06/15] net: ieee802154: stop dump llsec devs for monitors Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 07/15] net: ieee802154: forbid monitor for add llsec dev Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 08/15] net: ieee802154: forbid monitor for del " Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 09/15] net: ieee802154: stop dump llsec devkeys for monitors Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 10/15] net: ieee802154: forbid monitor for add llsec devkey Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 11/15] net: ieee802154: forbid monitor for del " Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 12/15] net: ieee802154: stop dump llsec seclevels for monitors Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 13/15] net: ieee802154: forbid monitor for add llsec seclevel Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 14/15] net: ieee802154: forbid monitor for del " Alexander Aring
2021-04-05  0:30 ` [PATCH RESEND wpan 15/15] net: ieee802154: stop dump llsec params for monitors Alexander Aring
2021-04-05 11:51 ` [PATCH RESEND wpan 00/15] net: ieee802154: forbid sec " Alexander Aring
2021-04-06 20:29 ` 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=20210405003054.256017-2-aahringo@redhat.com \
    --to=aahringo@redhat.com \
    --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).