From: Aleksandr Nogikh <aleksandrnogikh@gmail.com>
To: davem@davemloft.net, kuba@kernel.org, johannes@sipsolutions.net
Cc: edumazet@google.com, andreyknvl@google.com, dvyukov@google.com,
elver@google.com, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, linux-wireless@vger.kernel.org,
willemdebruijn.kernel@gmail.com,
Aleksandr Nogikh <nogikh@google.com>
Subject: [PATCH v5 3/3] mac80211: add KCOV remote annotations to incoming frame processing
Date: Thu, 29 Oct 2020 17:36:20 +0000 [thread overview]
Message-ID: <20201029173620.2121359-4-aleksandrnogikh@gmail.com> (raw)
In-Reply-To: <20201029173620.2121359-1-aleksandrnogikh@gmail.com>
From: Aleksandr Nogikh <nogikh@google.com>
Add KCOV remote annotations to ieee80211_iface_work() and
ieee80211_rx_list(). This will enable coverage-guided fuzzing of
mac80211 code that processes incoming 802.11 frames.
Signed-off-by: Aleksandr Nogikh <nogikh@google.com>
---
v4 -> v5:
* Using ieee80211_rx_list() instead of ieee80211_rx().
v1 -> v2:
* The commit now affects ieee80211_rx() instead of
ieee80211_tasklet_handler().
---
net/mac80211/iface.c | 2 ++
net/mac80211/rx.c | 16 +++++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 1be775979132..56a1bcea2c1c 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1356,6 +1356,7 @@ static void ieee80211_iface_work(struct work_struct *work)
while ((skb = skb_dequeue(&sdata->skb_queue))) {
struct ieee80211_mgmt *mgmt = (void *)skb->data;
+ kcov_remote_start_common(skb_get_kcov_handle(skb));
if (ieee80211_is_action(mgmt->frame_control) &&
mgmt->u.action.category == WLAN_CATEGORY_BACK) {
int len = skb->len;
@@ -1465,6 +1466,7 @@ static void ieee80211_iface_work(struct work_struct *work)
}
kfree_skb(skb);
+ kcov_remote_stop();
}
/* then other type-dependent work */
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 1e2e5a406d58..09d1c9fb8872 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -4742,6 +4742,8 @@ void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
status->rx_flags = 0;
+ kcov_remote_start_common(skb_get_kcov_handle(skb));
+
/*
* Frames with failed FCS/PLCP checksum are not returned,
* all other frames are returned without radiotap header
@@ -4749,15 +4751,15 @@ void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
* Also, frames with less than 16 bytes are dropped.
*/
skb = ieee80211_rx_monitor(local, skb, rate);
- if (!skb)
- return;
-
- ieee80211_tpt_led_trig_rx(local,
- ((struct ieee80211_hdr *)skb->data)->frame_control,
- skb->len);
+ if (skb) {
+ ieee80211_tpt_led_trig_rx(local,
+ ((struct ieee80211_hdr *)skb->data)->frame_control,
+ skb->len);
- __ieee80211_rx_handle_packet(hw, pubsta, skb, list);
+ __ieee80211_rx_handle_packet(hw, pubsta, skb, list);
+ }
+ kcov_remote_stop();
return;
drop:
kfree_skb(skb);
--
2.29.1.341.ge80a0c044ae-goog
next prev parent reply other threads:[~2020-10-29 17:37 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 17:36 [PATCH v5 0/3] net, mac80211, kernel: enable KCOV remote coverage collection for 802.11 frame handling Aleksandr Nogikh
2020-10-29 17:36 ` [PATCH v5 1/3] kernel: make kcov_common_handle consider the current context Aleksandr Nogikh
2020-10-29 17:36 ` [PATCH v5 2/3] net: add kcov handle to skb extensions Aleksandr Nogikh
2020-11-21 16:09 ` Ido Schimmel
2020-11-21 16:52 ` Florian Westphal
2020-11-21 17:39 ` Johannes Berg
2020-11-21 18:06 ` Jakub Kicinski
2020-11-21 18:12 ` Johannes Berg
2020-11-21 18:35 ` Jakub Kicinski
2020-11-21 19:30 ` Johannes Berg
2020-11-21 20:55 ` Jakub Kicinski
2020-11-21 20:58 ` Johannes Berg
2020-11-21 21:02 ` Jakub Kicinski
2020-11-25 16:30 ` Marco Elver
2020-12-01 1:52 ` Jakub Kicinski
2020-12-01 7:35 ` Ido Schimmel
2020-12-01 16:43 ` Jakub Kicinski
2020-10-29 17:36 ` Aleksandr Nogikh [this message]
2020-10-29 17:44 ` [PATCH v5 3/3] mac80211: add KCOV remote annotations to incoming frame processing Johannes Berg
2020-10-29 18:00 ` Marco Elver
2020-10-29 19:08 ` Andrey Konovalov
2020-11-03 3:00 ` [PATCH v5 0/3] net, mac80211, kernel: enable KCOV remote coverage collection for 802.11 frame handling Jakub Kicinski
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=20201029173620.2121359-4-aleksandrnogikh@gmail.com \
--to=aleksandrnogikh@gmail.com \
--cc=andreyknvl@google.com \
--cc=davem@davemloft.net \
--cc=dvyukov@google.com \
--cc=edumazet@google.com \
--cc=elver@google.com \
--cc=johannes@sipsolutions.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nogikh@google.com \
--cc=willemdebruijn.kernel@gmail.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).