From: arwelle@cert.org
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org
Subject: [RFC] mac80211_hwsim: Implements a check for ATTR_FREQ inside hwsim_cloned_frame_received_nl
Date: Fri, 30 Oct 2015 17:00:20 -0400 [thread overview]
Message-ID: <1446238820-21004-1-git-send-email-arwelle@cert.org> (raw)
From: Adam Welle <arwelle@cert.org>
If a frame is received from netlink with this value set it is checked against the current radio's frequency and discarded if different.
Signed-off-by: Adam Welle <arwelle@cert.org>
---
drivers/net/wireless/mac80211_hwsim.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index ee46f46..78faa72 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -2827,10 +2827,17 @@ static int hwsim_cloned_frame_received_nl(struct sk_buff *skb_2,
/* A frame is received from user space */
memset(&rx_status, 0, sizeof(rx_status));
- /* TODO: Check ATTR_FREQ if it exists, and maybe throw away off-channel
- * packets?
- */
- rx_status.freq = data2->channel->center_freq;
+
+ /* Check ATTR_FREQ if it exists, and throw away off-channel packets */
+ if (info->attrs[HWSIM_ATTR_FREQ])
+ rx_status.freq = nla_get_u32(info->attrs[HWSIM_ATTR_FREQ]);
+ else
+ rx_status.freq = data2->channel->center_freq;
+
+ /* Drop packet if not on the same frequency as this radio */
+ if (rx_status.freq != data2->channel->center_freq)
+ goto out;
+
rx_status.band = data2->channel->band;
rx_status.rate_idx = nla_get_u32(info->attrs[HWSIM_ATTR_RX_RATE]);
rx_status.signal = nla_get_u32(info->attrs[HWSIM_ATTR_SIGNAL]);
--
2.1.4
next reply other threads:[~2015-10-30 21:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-30 21:00 arwelle [this message]
2015-11-02 12:27 ` [RFC] mac80211_hwsim: Implements a check for ATTR_FREQ inside hwsim_cloned_frame_received_nl Johannes Berg
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=1446238820-21004-1-git-send-email-arwelle@cert.org \
--to=arwelle@cert.org \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.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).