From: Jeff Johnson <quic_jjohnson@quicinc.com>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Kalle Valo <kvalo@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <kernel-janitors@vger.kernel.org>,
"Kalle Valo" <quic_kvalo@quicinc.com>,
<linux-wireless@vger.kernel.org>
Subject: Re: [PATCH wireless 1/2] ath: dfs_pattern_detector: Fix a memory initialization issue
Date: Mon, 25 Sep 2023 11:46:02 -0700 [thread overview]
Message-ID: <c82d9d47-9c4b-4af9-a1e8-7c975b53fe30@quicinc.com> (raw)
In-Reply-To: <ad8c55b97ee4b330cb053ce2c448123c309cc91c.1695538105.git.christophe.jaillet@wanadoo.fr>
On 9/23/2023 11:57 PM, Christophe JAILLET wrote:
> If an error occurs and channel_detector_exit() is called, it relies on
> entries of the 'detectors' array to be NULL.
> Otherwise, it may access to un-initialized memory.
>
> Fix it and initialize the memory, as what was done before the commit in
> Fixes.
>
> Fixes: a063b650ce5d ("ath: dfs_pattern_detector: Avoid open coded arithmetic in memory allocation")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> Patch #1/2 is a fix, for for wireless.
> Patch #2/2 is for wireless-next I guess, but depnds on #1
>
> Not sure if we can mix different target in the same serie. Let me know.
>
> BTW, sorry for messing up things with a063b650ce5d :(
> ---
> drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/dfs_pattern_detector.c b/drivers/net/wireless/ath/dfs_pattern_detector.c
> index 27f4d74a41c8..2788a1b06c17 100644
> --- a/drivers/net/wireless/ath/dfs_pattern_detector.c
> +++ b/drivers/net/wireless/ath/dfs_pattern_detector.c
> @@ -206,7 +206,7 @@ channel_detector_create(struct dfs_pattern_detector *dpd, u16 freq)
>
> INIT_LIST_HEAD(&cd->head);
> cd->freq = freq;
> - cd->detectors = kmalloc_array(dpd->num_radar_types,
> + cd->detectors = kcalloc(dpd->num_radar_types,
> sizeof(*cd->detectors), GFP_ATOMIC);
nit: align descendant on (
> if (cd->detectors == NULL)
> goto fail;
next prev parent reply other threads:[~2023-09-25 18:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-24 6:57 Christophe JAILLET
2023-09-24 6:57 ` [PATCH wireless-next 2/2] ath: dfs_pattern_detector: Use flex array to simplify code Christophe JAILLET
2023-09-26 0:45 ` Jeff Johnson
2023-09-25 18:46 ` Jeff Johnson [this message]
2023-09-25 20:54 ` [PATCH wireless 1/2] ath: dfs_pattern_detector: Fix a memory initialization issue Christophe JAILLET
2023-09-26 0:27 ` Jeff Johnson
2023-09-26 0:44 ` Jeff Johnson
2023-10-02 16:58 ` Kalle Valo
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=c82d9d47-9c4b-4af9-a1e8-7c975b53fe30@quicinc.com \
--to=quic_jjohnson@quicinc.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=quic_kvalo@quicinc.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
all inboxes | Powered by JetHome®