From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] M28: Added guarding for reserved bits in GPIO driver
Date: Tue, 22 Nov 2011 15:49:24 +0100 [thread overview]
Message-ID: <201111221549.24955.marek.vasut@gmail.com> (raw)
In-Reply-To: <B0658F55E67EDE4A914644632835B2CAF7EB40@DEUTERIUM.delien.local>
> This patch fixes a small bug that allowed unintended manipulation of
> non-existing GPIO pins within a pin bank, clobbering reserved bits.
>
> Signed-off-by: Robert Deli?n <robert@delien.nl>
> diff --git a/arch/arm/include/asm/arch-mx28/iomux.h
> b/arch/arm/include/asm/arch-mx28/iomux.h index 7abdf58..829d9a8 100644
> --- a/arch/arm/include/asm/arch-mx28/iomux.h
> +++ b/arch/arm/include/asm/arch-mx28/iomux.h
> @@ -56,6 +56,12 @@ typedef u32 iomux_cfg_t;
> #define MXS_PAD_PULL_VALID_SHIFT 16
> #define MXS_PAD_PULL_VALID_MASK ((iomux_cfg_t)0x1 <<
> MXS_PAD_PULL_VALID_SHIFT)
>
> +#define MXS_BANK0_PINS 29
> +#define MXS_BANK1_PINS 32
> +#define MXS_BANK2_PINS 28
> +#define MXS_BANK3_PINS 31
> +#define MXS_BANK4_PINS 21
> +
> #define PAD_MUXSEL_0 0
> #define PAD_MUXSEL_1 1
> #define PAD_MUXSEL_2 2
> diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
> index 539738b..fbc6da3 100644
> --- a/drivers/gpio/mxs_gpio.c
> +++ b/drivers/gpio/mxs_gpio.c
> @@ -120,9 +120,34 @@ int gpio_direction_output(int gp, int value)
>
> int gpio_request(int gp, const char *label)
> {
> + int bank_pins;
> +
> if (PAD_BANK(gp) >= PINCTRL_BANKS)
> return -EINVAL;
>
> + switch(PAD_BANK(gp)) {
> + case 0:
> + bank_pins = MXS_BANK0_PINS;
> + break;
> + case 1:
> + bank_pins = MXS_BANK1_PINS;
> + break;
> + case 2:
> + bank_pins = MXS_BANK2_PINS;
> + break;
> + case 3:
> + bank_pins = MXS_BANK3_PINS;
> + break;
> + case 4:
> + bank_pins = MXS_BANK4_PINS;
> + break;
> + default:
> + bank_pins = 0;
> + }
> +
> + if (PAD_PIN(gp) >= bank_pins)
> + return -EINVAL;
> +
> return 0;
> }
Hey, this looks reasonable. Did you send similar patch to Linux too ?
M
next prev parent reply other threads:[~2011-11-22 14:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-22 14:41 [U-Boot] [PATCH] M28: Added guarding for reserved bits in GPIO driver Robert Deliën
2011-11-22 14:49 ` Marek Vasut [this message]
[not found] ` <B4232BD0-3457-4DC5-9A4A-4E16719BA157@delien.nl>
2011-11-22 15:25 ` Marek Vasut
2011-11-22 16:48 ` Robert Deliën
2011-11-22 18:08 ` Marek Vasut
2011-11-22 18:20 ` Marek Vasut
2011-11-22 19:24 ` Robert Deliën
2011-11-22 22:36 ` Marek Vasut
2011-11-23 10:47 ` Robert Deliën
2011-11-23 10:59 ` Marek Vasut
2011-11-23 12:36 ` Robert Deliën
2011-11-22 21:09 ` Mike Frysinger
2011-11-22 21:16 ` Robert Deliën
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=201111221549.24955.marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=u-boot@lists.denx.de \
/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