* [PATCH] pinctrl: lpc18xx: ensure ngroups is initialized at correct place
@ 2016-02-24 17:32 Colin King
2016-02-25 18:32 ` Joachim Eastwood
2016-03-07 3:28 ` Linus Walleij
0 siblings, 2 replies; 3+ messages in thread
From: Colin King @ 2016-02-24 17:32 UTC (permalink / raw)
To: Linus Walleij, Joachim Eastwood, linux-gpio, linux-arm-kernel
Cc: linux-kernel
From: Colin Ian King <colin.king@canonical.com>
The initialization of ngroups is occurring at the end of the
first iteration of the outer loop, which means that the
assignment pins[ngroups++] = i is potentially indexing into
a region outside of array pins because ngroups is not initialized.
Instead, initialize ngroups in the inner loop before the first
inner loop iteration.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/pinctrl/pinctrl-lpc18xx.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-lpc18xx.c b/drivers/pinctrl/pinctrl-lpc18xx.c
index f0bebbe..ed1cfa7 100644
--- a/drivers/pinctrl/pinctrl-lpc18xx.c
+++ b/drivers/pinctrl/pinctrl-lpc18xx.c
@@ -1170,9 +1170,8 @@ static int lpc18xx_create_group_func_map(struct device *dev,
u16 pins[ARRAY_SIZE(lpc18xx_pins)];
int func, ngroups, i;
- for (func = 0; func < FUNC_MAX; ngroups = 0, func++) {
-
- for (i = 0; i < ARRAY_SIZE(lpc18xx_pins); i++) {
+ for (func = 0; func < FUNC_MAX; func++) {
+ for (ngroups = 0, i = 0; i < ARRAY_SIZE(lpc18xx_pins); i++) {
if (lpc18xx_valid_pin_function(i, func))
pins[ngroups++] = i;
}
--
2.7.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] pinctrl: lpc18xx: ensure ngroups is initialized at correct place
2016-02-24 17:32 [PATCH] pinctrl: lpc18xx: ensure ngroups is initialized at correct place Colin King
@ 2016-02-25 18:32 ` Joachim Eastwood
2016-03-07 3:28 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Joachim Eastwood @ 2016-02-25 18:32 UTC (permalink / raw)
To: Colin King
Cc: Linus Walleij, linux-gpio, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Hi Colin,
On 24 February 2016 at 18:32, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The initialization of ngroups is occurring at the end of the
> first iteration of the outer loop, which means that the
> assignment pins[ngroups++] = i is potentially indexing into
> a region outside of array pins because ngroups is not initialized.
> Instead, initialize ngroups in the inner loop before the first
> inner loop iteration.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/pinctrl/pinctrl-lpc18xx.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-lpc18xx.c b/drivers/pinctrl/pinctrl-lpc18xx.c
> index f0bebbe..ed1cfa7 100644
> --- a/drivers/pinctrl/pinctrl-lpc18xx.c
> +++ b/drivers/pinctrl/pinctrl-lpc18xx.c
> @@ -1170,9 +1170,8 @@ static int lpc18xx_create_group_func_map(struct device *dev,
> u16 pins[ARRAY_SIZE(lpc18xx_pins)];
> int func, ngroups, i;
>
> - for (func = 0; func < FUNC_MAX; ngroups = 0, func++) {
> -
> - for (i = 0; i < ARRAY_SIZE(lpc18xx_pins); i++) {
> + for (func = 0; func < FUNC_MAX; func++) {
> + for (ngroups = 0, i = 0; i < ARRAY_SIZE(lpc18xx_pins); i++) {
Good catch!
Reviewed-by: Joachim Eastwood <manabian@gmail.com>
regards,
Joachim Eastwood
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] pinctrl: lpc18xx: ensure ngroups is initialized at correct place
2016-02-24 17:32 [PATCH] pinctrl: lpc18xx: ensure ngroups is initialized at correct place Colin King
2016-02-25 18:32 ` Joachim Eastwood
@ 2016-03-07 3:28 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2016-03-07 3:28 UTC (permalink / raw)
To: Colin King
Cc: Joachim Eastwood, linux-gpio@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
On Thu, Feb 25, 2016 at 12:32 AM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The initialization of ngroups is occurring at the end of the
> first iteration of the outer loop, which means that the
> assignment pins[ngroups++] = i is potentially indexing into
> a region outside of array pins because ngroups is not initialized.
> Instead, initialize ngroups in the inner loop before the first
> inner loop iteration.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Patch applied with Joachim's review tag.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-07 3:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-24 17:32 [PATCH] pinctrl: lpc18xx: ensure ngroups is initialized at correct place Colin King
2016-02-25 18:32 ` Joachim Eastwood
2016-03-07 3:28 ` Linus Walleij
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).