[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LFD.2.11.1406041308450.1560@denkbrett>
Date: Wed, 4 Jun 2014 13:09:12 +0200 (CEST)
From: Sebastian Ott <sebott@...ux.vnet.ibm.com>
To: Julia Lawall <Julia.Lawall@...6.fr>
cc: kernel-janitors@...r.kernel.org,
Gerald Schaefer <gerald.schaefer@...ibm.com>,
Martin Schwidefsky <schwidefsky@...ibm.com>,
Heiko Carstens <heiko.carstens@...ibm.com>,
linux390@...ibm.com, linux-s390@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH 8/10] s390/pci: use safer test on the result of
find_first_zero_bit
On Wed, 4 Jun 2014, Julia Lawall wrote:
> From: Julia Lawall <Julia.Lawall@...6.fr>
>
> Find_first_zero_bit considers BITS_PER_LONG bits at a time, and thus may
> return a larger number than the maximum position argument if that position
> is not a multiple of BITS_PER_LONG.
>
> The semantic match that finds this problem is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> expression e1,e2,e3;
> statement S1,S2;
> @@
>
> e1 = find_first_zero_bit(e2,e3)
> ...
> if (e1
> - ==
> + >=
> e3)
> S1 else S2
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@...6.fr>
>
> ---
> arch/s390/pci/pci.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff -u -p a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
> --- a/arch/s390/pci/pci.c
> +++ b/arch/s390/pci/pci.c
> @@ -566,7 +566,7 @@ static int zpci_alloc_iomap(struct zpci_
>
> spin_lock(&zpci_iomap_lock);
> entry = find_first_zero_bit(zpci_iomap, ZPCI_IOMAP_MAX_ENTRIES);
> - if (entry == ZPCI_IOMAP_MAX_ENTRIES) {
> + if (entry >= ZPCI_IOMAP_MAX_ENTRIES) {
> spin_unlock(&zpci_iomap_lock);
> return -ENOSPC;
> }
> @@ -746,7 +746,7 @@ static int zpci_alloc_domain(struct zpci
> {
> spin_lock(&zpci_domain_lock);
> zdev->domain = find_first_zero_bit(zpci_domain, ZPCI_NR_DEVICES);
> - if (zdev->domain == ZPCI_NR_DEVICES) {
> + if (zdev->domain >= ZPCI_NR_DEVICES) {
> spin_unlock(&zpci_domain_lock);
> return -ENOSPC;
> }
>
>
Thanks, applied.
Sebastian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists