From: human.hwang@samsung.com (Hyungwon Hwang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] arm: dma-mapping: fix off-by-one error in bitmap size check
Date: Thu, 02 Jul 2015 09:50:07 +0900 [thread overview]
Message-ID: <20150702095007.1d20ed75@hwh-ubuntu> (raw)
In-Reply-To: <1435758406-6989-1-git-send-email-m.szyprowski@samsung.com>
Dear Marek,
On Wed, 01 Jul 2015 15:46:38 +0200
Marek Szyprowski <m.szyprowski@samsung.com> wrote:
> nr_bitmaps member of mapping structure stores the number of already
> allocated bitmaps and it is interpreted as loop iterator (it starts
> from 0 not from 1), so a comparison against number of possible bitmap
> extensions should include this fact. This patch fixes this by changing
> the extension failure condition. This issue has been introduced by
> commit 4d852ef8c2544ce21ae41414099a7504c61164a0 ("arm: dma-mapping:
> Add support to extend DMA IOMMU mappings").
>
> Reported-by: Hyungwon Hwang <human.hwang@samsung.com>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> CC: stable at vger.kernel.org # v3.15+
> ---
> V2 fixed build problem caused by a hurry in patch preparation. My
> fault. I'm really sorry for the noise.
>
> Best regards
> Marek Szyprowski, PhD
> Samsung R&D Institute Poland
> ---
> arch/arm/mm/dma-mapping.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> index a64b7f621067..05619542a1c0 100644
> --- a/arch/arm/mm/dma-mapping.c
> +++ b/arch/arm/mm/dma-mapping.c
> @@ -2015,7 +2015,7 @@ static int extend_iommu_mapping(struct
> dma_iommu_mapping *mapping) {
> int next_bitmap;
>
> - if (mapping->nr_bitmaps > mapping->extensions)
> + if (mapping->nr_bitmaps >= mapping->extensions)
> return -EINVAL;
>
> next_bitmap = mapping->nr_bitmaps;
With this patch, the error disappeared on my private arm board. Also,
the fix is clearly reasonable.
Reviewed-by: Hyungwon Hwang <human.hwang@samsung.com>
prev parent reply other threads:[~2015-07-02 0:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-01 12:48 [PATCH] arm: dma-mapping: fix off-by-one error in bitmap size check Marek Szyprowski
2015-07-01 13:12 ` Ard Biesheuvel
2015-07-01 13:46 ` [PATCH v2] " Marek Szyprowski
2015-07-02 0:50 ` Hyungwon Hwang [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=20150702095007.1d20ed75@hwh-ubuntu \
--to=human.hwang@samsung.com \
--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 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).