From: m.szyprowski@samsung•com (Marek Szyprowski)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] arm: dma-mapping: Fix mapping size value
Date: Tue, 22 Apr 2014 11:09:29 +0200 [thread overview]
Message-ID: <535631C9.9060100@samsung.com> (raw)
In-Reply-To: <1398062847-5770-2-git-send-email-ritesh.harjani@gmail.com>
Hello,
On 2014-04-21 08:47, Ritesh Harjani wrote:
> 68efd7d2fb("arm: dma-mapping: remove order parameter from
> arm_iommu_create_mapping()") is causing kernel panic
> because it wrongly sets the value of mapping->size:
>
> Unable to handle kernel NULL pointer dereference at virtual
> address 000000a0
> pgd = e7a84000
> [000000a0] *pgd=00000000
> ...
> PC is at bitmap_clear+0x48/0xd0
> LR is at __iommu_remove_mapping+0x130/0x164
>
> Fix it by correcting mapping->size value.
>
> Signed-off-by: Ritesh Harjani <ritesh.harjani@gmail•com>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard•com>
Thanks for spotting this issue! I'm really sorry for introducing it. I
will push it to the fixes branch asap.
> ---
> 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 f62aa06..6b00be1 100644
> --- a/arch/arm/mm/dma-mapping.c
> +++ b/arch/arm/mm/dma-mapping.c
> @@ -1963,8 +1963,8 @@ arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, size_t size)
> mapping->nr_bitmaps = 1;
> mapping->extensions = extensions;
> mapping->base = base;
> - mapping->size = bitmap_size << PAGE_SHIFT;
> mapping->bits = BITS_PER_BYTE * bitmap_size;
> + mapping->size = mapping->bits << PAGE_SHIFT;
>
> spin_lock_init(&mapping->lock);
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
next prev parent reply other threads:[~2014-04-22 9:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-21 6:47 [PATCH RESEND] arm: dma-mapping: Fix mapping size value Ritesh Harjani
2014-04-21 6:47 ` [PATCH] " Ritesh Harjani
2014-04-22 8:53 ` Will Deacon
2014-04-23 8:53 ` Marek Szyprowski
2014-04-23 9:30 ` Laurent Pinchart
2014-04-23 10:04 ` Ritesh Harjani
2014-04-23 13:17 ` Marek Szyprowski
2014-04-23 13:22 ` Ritesh Harjani
2014-04-22 9:09 ` Marek Szyprowski [this message]
[not found] <CAD15agZwxTQOBZtJCmAkbBW6hXGfRgedSc_Fi_-nHOE5MeAjTw@mail.gmail.com>
2014-04-21 9:53 ` Laurent Pinchart
2014-04-21 12:25 ` Laurent Pinchart
-- strict thread matches above, loose matches on Subject: below --
2014-04-19 11:19 Ritesh Harjani
2014-04-19 11:25 ` Ritesh Harjani
2014-04-20 22:36 ` Laurent Pinchart
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=535631C9.9060100@samsung.com \
--to=m.szyprowski@samsung$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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