From: Xiaomeng Tong <xiam0nd.tong@gmail.com>
To: chunkeey@googlemail.com
Cc: kvalo@kernel.org, davem@davemloft.net, kuba@kernel.org,
pabeni@redhat.com, linville@tuxdriver.com,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Xiaomeng Tong <xiam0nd.tong@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH] carl9170: main: fix an incorrect use of list iterator
Date: Sun, 27 Mar 2022 15:27:02 +0800 [thread overview]
Message-ID: <20220327072702.10572-1-xiam0nd.tong@gmail.com> (raw)
The bug is here:
rcu_assign_pointer(ar->tx_ampdu_iter,
(struct carl9170_sta_tid *) &ar->tx_ampdu_list);
The 'ar->tx_ampdu_iter' is used as a list iterator variable
which point to a structure object containing the list HEAD
(&ar->tx_ampdu_list), not as the HEAD itself.
The only use case of 'ar->tx_ampdu_iter' is as a base pos
for list_for_each_entry_continue_rcu in carl9170_tx_ampdu().
If the iterator variable holds the *wrong* HEAD value here
(has not been modified elsewhere before), this will lead to
an invalid memory access.
Using list_entry_rcu to get the right list iterator variable
and reassign it, to fix this bug.
Note: use 'ar->tx_ampdu_list.next' instead of '&ar->tx_ampdu_list'
to avoid compiler error.
Cc: stable@vger.kernel.org
Fixes: fe8ee9ad80b28 ("carl9170: mac80211 glue and command interface")
Signed-off-by: Xiaomeng Tong <xiam0nd.tong@gmail.com>
---
drivers/net/wireless/ath/carl9170/main.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 49f7ee1c912b..a287937bf666 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1756,6 +1756,7 @@ static const struct ieee80211_ops carl9170_ops = {
void *carl9170_alloc(size_t priv_size)
{
+ struct carl9170_sta_tid *tid_info;
struct ieee80211_hw *hw;
struct ar9170 *ar;
struct sk_buff *skb;
@@ -1815,8 +1816,9 @@ void *carl9170_alloc(size_t priv_size)
INIT_DELAYED_WORK(&ar->stat_work, carl9170_stat_work);
INIT_DELAYED_WORK(&ar->tx_janitor, carl9170_tx_janitor);
INIT_LIST_HEAD(&ar->tx_ampdu_list);
- rcu_assign_pointer(ar->tx_ampdu_iter,
- (struct carl9170_sta_tid *) &ar->tx_ampdu_list);
+ tid_info = list_entry_rcu(ar->tx_ampdu_list.next,
+ struct carl9170_sta_tid, list);
+ rcu_assign_pointer(ar->tx_ampdu_iter, tid_info);
bitmap_zero(&ar->vif_bitmap, ar->fw.vif_num);
INIT_LIST_HEAD(&ar->vif_list);
--
2.17.1
next reply other threads:[~2022-03-27 7:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-27 7:27 Xiaomeng Tong [this message]
2022-03-27 12:05 ` Christian Lamparter
2022-03-27 14:11 ` Xiaomeng Tong
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=20220327072702.10572-1-xiam0nd.tong@gmail.com \
--to=xiam0nd.tong@gmail.com \
--cc=chunkeey@googlemail.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stable@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
all inboxes | Powered by JetHome®