From: karl@hiramoto.org (Karl Hiramoto)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] IXP4xx: Ensure index is positive
Date: Tue, 03 Nov 2009 21:27:23 +0100 [thread overview]
Message-ID: <4AF0922B.3030701@hiramoto.org> (raw)
In-Reply-To: <4AF08014.4000704@gmail.com>
Roel Kluin wrote:
> The indexes are signed, make sure they are not negative
> when we read the array elements.
>
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> ---
> arch/arm/mach-ixp4xx/common.c | 2 +-
> arch/arm/mach-ixp4xx/ixp4xx_npe.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
> index cfd52fb..2df77bc 100644
> --- a/arch/arm/mach-ixp4xx/common.c
> +++ b/arch/arm/mach-ixp4xx/common.c
> @@ -119,7 +119,7 @@ EXPORT_SYMBOL(gpio_to_irq);
>
> int irq_to_gpio(int irq)
> {
> - int gpio = (irq < 32) ? irq2gpio[irq] : -EINVAL;
> + int gpio = (irq < 32 && irq >= 0) ? irq2gpio[irq] : -EINVAL;
>
> if (gpio == -1)
> return -EINVAL;
> diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
> index 47ac69c..30e1456 100644
> --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
> +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
> @@ -667,7 +667,7 @@ err:
>
> struct npe *npe_request(int id)
> {
> - if (id < NPE_COUNT)
> + if (id >= 0 && id < NPE_COUNT)
> if (npe_tab[id].valid)
> if (try_module_get(THIS_MODULE))
> return &npe_tab[id];
>
>
changing npe_request() to unsigned would probably be better and not add
to bloat. If your calling these functions with negative arguments,
your code is buggy then.
WARNING: multiple messages have this Message-ID (diff)
From: Karl Hiramoto <karl@hiramoto.org>
To: Roel Kluin <roel.kluin@gmail.com>
Cc: Imre Kaloz <kaloz@openwrt.org>, Krzysztof Halasa <khc@pm.waw.pl>,
linux-arm-kernel@lists.infradead.org,
Andrew Morton <akpm@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] IXP4xx: Ensure index is positive
Date: Tue, 03 Nov 2009 21:27:23 +0100 [thread overview]
Message-ID: <4AF0922B.3030701@hiramoto.org> (raw)
In-Reply-To: <4AF08014.4000704@gmail.com>
Roel Kluin wrote:
> The indexes are signed, make sure they are not negative
> when we read the array elements.
>
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> ---
> arch/arm/mach-ixp4xx/common.c | 2 +-
> arch/arm/mach-ixp4xx/ixp4xx_npe.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
> index cfd52fb..2df77bc 100644
> --- a/arch/arm/mach-ixp4xx/common.c
> +++ b/arch/arm/mach-ixp4xx/common.c
> @@ -119,7 +119,7 @@ EXPORT_SYMBOL(gpio_to_irq);
>
> int irq_to_gpio(int irq)
> {
> - int gpio = (irq < 32) ? irq2gpio[irq] : -EINVAL;
> + int gpio = (irq < 32 && irq >= 0) ? irq2gpio[irq] : -EINVAL;
>
> if (gpio == -1)
> return -EINVAL;
> diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
> index 47ac69c..30e1456 100644
> --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
> +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
> @@ -667,7 +667,7 @@ err:
>
> struct npe *npe_request(int id)
> {
> - if (id < NPE_COUNT)
> + if (id >= 0 && id < NPE_COUNT)
> if (npe_tab[id].valid)
> if (try_module_get(THIS_MODULE))
> return &npe_tab[id];
>
>
changing npe_request() to unsigned would probably be better and not add
to bloat. If your calling these functions with negative arguments,
your code is buggy then.
next prev parent reply other threads:[~2009-11-03 20:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-03 19:10 [PATCH] IXP4xx: Ensure index is positive Roel Kluin
2009-11-03 19:10 ` Roel Kluin
2009-11-03 20:27 ` Karl Hiramoto [this message]
2009-11-03 20:27 ` Karl Hiramoto
2009-11-03 21:23 ` Krzysztof Halasa
2009-11-03 21:23 ` Krzysztof Halasa
2009-11-03 22:05 ` Roel Kluin
2009-11-03 22:05 ` Roel Kluin
2009-11-05 13:04 ` Krzysztof Halasa
2009-11-05 13:04 ` Krzysztof Halasa
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=4AF0922B.3030701@hiramoto.org \
--to=karl@hiramoto.org \
--cc=linux-arm-kernel@lists.infradead.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 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.