linux-wpan.vger.kernel.org archive mirror
 help / color / mirror / 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+cde43a581a8e5f317bc2@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 4.19 22/28] net: ieee802154: stop dump llsec params for monitors
Date: Mon, 12 Apr 2021 12:25:47 -0400	[thread overview]
Message-ID: <20210412162553.315227-22-sashal@kernel.org> (raw)
In-Reply-To: <20210412162553.315227-1-sashal@kernel.org>

From: Alexander Aring <aahringo@redhat.com>

[ Upstream commit 1534efc7bbc1121e92c86c2dabebaf2c9dcece19 ]

This patch stops dumping llsec params for monitors which we don't support
yet. Otherwise we will access llsec mib which isn't initialized for
monitors.

Reported-by: syzbot+cde43a581a8e5f317bc2@syzkaller.appspotmail.com
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Link: https://lore.kernel.org/r/20210405003054.256017-16-aahringo@redhat.com
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 net/ieee802154/nl802154.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 138aa41fb6f7..f2ddeb73c3ef 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -836,8 +836,13 @@ nl802154_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flags,
 		goto nla_put_failure;
 
 #ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
+	if (wpan_dev->iftype == NL802154_IFTYPE_MONITOR)
+		goto out;
+
 	if (nl802154_get_llsec_params(msg, rdev, wpan_dev) < 0)
 		goto nla_put_failure;
+
+out:
 #endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
 
 	genlmsg_end(msg, hdr);
-- 
2.30.2


  parent reply	other threads:[~2021-04-12 16:33 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-12 16:25 [PATCH AUTOSEL 4.19 01/28] net: ieee802154: nl-mac: fix check on panid Sasha Levin
2021-04-12 16:25 ` [PATCH AUTOSEL 4.19 08/28] drivers: net: fix memory leak in atusb_probe Sasha Levin
2021-04-12 16:25 ` [PATCH AUTOSEL 4.19 13/28] net: ieee802154: forbid monitor for set llsec params Sasha Levin
2021-04-12 16:25 ` [PATCH AUTOSEL 4.19 14/28] net: ieee802154: stop dump llsec keys for monitors Sasha Levin
2021-04-12 16:25 ` [PATCH AUTOSEL 4.19 15/28] net: ieee802154: stop dump llsec devs " Sasha Levin
2021-04-12 16:25 ` [PATCH AUTOSEL 4.19 16/28] net: ieee802154: forbid monitor for add llsec dev Sasha Levin
2021-04-12 16:25 ` [PATCH AUTOSEL 4.19 17/28] net: ieee802154: stop dump llsec devkeys for monitors Sasha Levin
2021-04-12 16:25 ` [PATCH AUTOSEL 4.19 18/28] net: ieee802154: forbid monitor for add llsec devkey Sasha Levin
2021-04-12 16:25 ` [PATCH AUTOSEL 4.19 19/28] net: ieee802154: stop dump llsec seclevels for monitors Sasha Levin
2021-04-12 16:25 ` [PATCH AUTOSEL 4.19 20/28] net: ieee802154: forbid monitor for add llsec seclevel Sasha Levin
2021-04-12 16:25 ` [PATCH AUTOSEL 4.19 21/28] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:25 ` Sasha Levin [this message]
2021-04-12 16:25 ` [PATCH AUTOSEL 4.19 23/28] 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=20210412162553.315227-22-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+cde43a581a8e5f317bc2@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).