From: Stephen Boyd <sboyd@kernel.org>
To: Binbin Zhou <zhoubinbin@loongson.cn>,
Gustavo A. R. Silva <gustavoars@kernel.org>,
Huacai Chen <chenhuacai@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Yinbo Zhu <zhuyinbo@loongson.cn>
Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
Gustavo A. R. Silva <gustavoars@kernel.org>,
linux-hardening@vger.kernel.org
Subject: Re: [PATCH] clk: clk-loongson2: Fix memory corruption bug in struct loongson2_clk_provider
Date: Thu, 14 Nov 2024 15:03:19 -0800 [thread overview]
Message-ID: <ddc333ad3a150b1d3cc360bd16cc3459.sboyd@kernel.org> (raw)
In-Reply-To: <ZzZ-cd_EFXs6qFaH@kspp>
Quoting Gustavo A. R. Silva (2024-11-14 14:49:21)
> Some heap space is allocated for the flexible structure `struct
> clk_hw_onecell_data` and its flexible-array member `hws` through
> the composite structure `struct loongson2_clk_provider` in function
> `loongson2_clk_probe()`, as shown below:
>
> 289 struct loongson2_clk_provider *clp;
> ...
> 296 for (p = data; p->name; p++)
> 297 clks_num++;
> 298
> 299 clp = devm_kzalloc(dev, struct_size(clp, clk_data.hws, clks_num),
> 300 GFP_KERNEL);
>
> Then some data is written into the flexible array:
>
> 350 clp->clk_data.hws[p->id] = hw;
>
> This corrupts `clk_lock`, which is the spinlock variable immediately
> following the `clk_data` member in `struct loongson2_clk_provider`:
>
> struct loongson2_clk_provider {
> void __iomem *base;
> struct device *dev;
> struct clk_hw_onecell_data clk_data;
> spinlock_t clk_lock; /* protect access to DIV registers */
> };
>
> The problem is that the flexible structure is currently placed in the
> middle of `struct loongson2_clk_provider` instead of at the end.
>
> Fix this by moving `struct clk_hw_onecell_data clk_data;` to the end of
> `struct loongson2_clk_provider`. Also, add a code comment to help
> prevent this from happening again in case new members are added to the
> structure in the future.
>
> This change also fixes the following -Wflex-array-member-not-at-end
> warning:
>
> drivers/clk/clk-loongson2.c:32:36: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
>
> Fixes: 9796ec0bd04b ("clk: clk-loongson2: Refactor driver for adding new platforms")
> Cc: stable@vger.kernel.org
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> ---
Applied to clk-next
prev parent reply other threads:[~2024-11-14 23:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-14 22:49 [PATCH] clk: clk-loongson2: Fix memory corruption bug in struct loongson2_clk_provider Gustavo A. R. Silva
2024-11-14 23:03 ` Stephen Boyd [this message]
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=ddc333ad3a150b1d3cc360bd16cc3459.sboyd@kernel.org \
--to=sboyd@kernel.org \
--cc=chenhuacai@kernel.org \
--cc=gustavoars@kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=zhoubinbin@loongson.cn \
--cc=zhuyinbo@loongson.cn \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.