From: James Prestwood <prestwoj@gmail.com>
To: iwd@lists.linux.dev
Cc: James Prestwood <prestwoj@gmail.com>
Subject: [PATCH] netdev: loosen parsing requirements on STA_INFO
Date: Fri, 20 Sep 2024 04:36:36 -0700 [thread overview]
Message-ID: <20240920113636.201189-1-prestwoj@gmail.com> (raw)
If one of the nested attributes in STA_INFO isn't exactly what we
expect in terms of length or content skip it rather than fatally
return. Each of the diagnostic info members uses a bool to indicate
if it was found, so if one is unable to parse it just won't be
present in the diagnostic message.
---
src/netdev.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/netdev.c b/src/netdev.c
index d95a2a1e..995918ab 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -581,7 +581,7 @@ static bool netdev_parse_sta_info(struct l_genl_attr *attr,
switch (type) {
case NL80211_STA_INFO_SIGNAL:
if (len != 1)
- return false;
+ continue;
info->cur_rssi = *(const int8_t *) data;
info->have_cur_rssi = true;
@@ -589,7 +589,7 @@ static bool netdev_parse_sta_info(struct l_genl_attr *attr,
break;
case NL80211_STA_INFO_SIGNAL_AVG:
if (len != 1)
- return false;
+ continue;
info->avg_rssi = *(const int8_t *) data;
info->have_avg_rssi = true;
@@ -597,12 +597,12 @@ static bool netdev_parse_sta_info(struct l_genl_attr *attr,
break;
case NL80211_STA_INFO_RX_BITRATE:
if (!l_genl_attr_recurse(attr, &nested))
- return false;
+ continue;
if (!netdev_parse_bitrate(&nested, &info->rx_mcs_type,
&info->rx_bitrate,
&info->rx_mcs))
- return false;
+ continue;
info->have_rx_bitrate = true;
@@ -613,12 +613,12 @@ static bool netdev_parse_sta_info(struct l_genl_attr *attr,
case NL80211_STA_INFO_TX_BITRATE:
if (!l_genl_attr_recurse(attr, &nested))
- return false;
+ continue;
if (!netdev_parse_bitrate(&nested, &info->tx_mcs_type,
&info->tx_bitrate,
&info->tx_mcs))
- return false;
+ continue;
info->have_tx_bitrate = true;
@@ -629,7 +629,7 @@ static bool netdev_parse_sta_info(struct l_genl_attr *attr,
case NL80211_STA_INFO_EXPECTED_THROUGHPUT:
if (len != 4)
- return false;
+ continue;
info->expected_throughput = l_get_u32(data);
info->have_expected_throughput = true;
--
2.34.1
reply other threads:[~2024-09-20 11:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20240920113636.201189-1-prestwoj@gmail.com \
--to=prestwoj@gmail.com \
--cc=iwd@lists.linux.dev \
/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