Linux-WPAN Archive on lore.kernel.org
 help / color / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Alexander Aring <aahringo@redhat.com>,
	syzbot+ce4e062c2d51977ddc50@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.4 03/39] net: ieee802154: fix nl802154 add llsec key
Date: Mon, 12 Apr 2021 12:24:25 -0400
Message-ID: <20210412162502.314854-3-sashal@kernel.org> (raw)
In-Reply-To: <20210412162502.314854-1-sashal@kernel.org>

From: Alexander Aring <aahringo@redhat.com>

[ Upstream commit 20d5fe2d7103f5c43ad11a3d6d259e9d61165c35 ]

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: 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 829696a3e2c7..43003108be95 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -1560,7 +1560,8 @@ static int nl802154_add_llsec_key(struct sk_buff *skb, struct genl_info *info)
 	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] ||
-- 
2.30.2


  parent reply index

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-12 16:24 [PATCH AUTOSEL 5.4 01/39] net: ieee802154: fix nl802154 del " Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 02/39] net: ieee802154: fix nl802154 del llsec dev Sasha Levin
2021-04-12 16:24 ` Sasha Levin [this message]
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 04/39] net: ieee802154: fix nl802154 del llsec devkey Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 05/39] net: ieee802154: nl-mac: fix check on panid Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 14/39] drivers: net: fix memory leak in atusb_probe Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 19/39] net: ieee802154: forbid monitor for set llsec params Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 20/39] net: ieee802154: stop dump llsec keys for monitors Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 21/39] net: ieee802154: forbid monitor for add llsec key Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 22/39] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 23/39] net: ieee802154: stop dump llsec devs for monitors Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 24/39] net: ieee802154: forbid monitor for add llsec dev Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 25/39] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 26/39] net: ieee802154: stop dump llsec devkeys for monitors Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 27/39] net: ieee802154: forbid monitor for add llsec devkey Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 28/39] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 29/39] net: ieee802154: stop dump llsec seclevels for monitors Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 30/39] net: ieee802154: forbid monitor for add llsec seclevel Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 31/39] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 32/39] net: ieee802154: stop dump llsec params for monitors Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.4 33/39] 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=20210412162502.314854-3-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+ce4e062c2d51977ddc50@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

Linux-WPAN Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-wpan/0 linux-wpan/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-wpan linux-wpan/ https://lore.kernel.org/linux-wpan \
		linux-wpan@vger.kernel.org
	public-inbox-index linux-wpan

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-wpan


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git