From: Kevin Grandemange <kevin.grandemange@allegrodvt.com>
To: Christoph Hellwig <hch@lst.de>
Cc: "iommu@lists.linux-foundation.org"
<iommu@lists.linux-foundation.org>,
Kevin Grandemange <kevin.grandemange@allegrodvt.com>,
Robin Murphy <robin.murphy@arm.com>
Subject: [PATCH] [dma-coherent] Fix integer overflow in the reserved-memory dma allocation
Date: Mon, 9 Mar 2020 11:02:01 +0000 [thread overview]
Message-ID: <20200309110134.7672-1-kevin.grandemange@allegrodvt.com> (raw)
pageno is an int and the PAGE_SHIFT shift is done on an int,
overflowing if the memory is bigger than 2G
This can be reproduced using for example a reserved-memory of 4G
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
ranges;
reserved_dma: buffer@0 {
compatible = "shared-dma-pool";
no-map;
reg = <0x5 0x00000000 0x4 0x0>;
};
};
Signed-off-by: Kevin Grandemange <kevin.grandemange@allegrodvt.com>
---
kernel/dma/coherent.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c
index 551b0eb7028a..c20c6c0635b7 100644
--- a/kernel/dma/coherent.c
+++ b/kernel/dma/coherent.c
@@ -130,6 +130,7 @@ static void *__dma_alloc_from_coherent(struct device *dev,
int order = get_order(size);
unsigned long flags;
int pageno;
+ ssize_t mem_offset;
void *ret;
spin_lock_irqsave(&mem->spinlock, flags);
@@ -144,8 +145,9 @@ static void *__dma_alloc_from_coherent(struct device *dev,
/*
* Memory was found in the coherent area.
*/
- *dma_handle = dma_get_device_base(dev, mem) + (pageno << PAGE_SHIFT);
- ret = mem->virt_base + (pageno << PAGE_SHIFT);
+ mem_offset = (ssize_t)pageno << PAGE_SHIFT;
+ *dma_handle = dma_get_device_base(dev, mem) + mem_offset;
+ ret = mem->virt_base + mem_offset;
spin_unlock_irqrestore(&mem->spinlock, flags);
memset(ret, 0, size);
return ret;
--
2.20.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next reply other threads:[~2020-03-09 14:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-09 11:02 Kevin Grandemange [this message]
2020-03-09 13:56 ` [PATCH] [dma-coherent] Fix integer overflow in the reserved-memory dma allocation Robin Murphy
2020-03-09 14:45 ` Kevin Grandemange
2020-03-09 15:22 ` [PATCH v2] " Kevin Grandemange
2020-03-12 15:41 ` [PATCH v3] " Kevin Grandemange
2020-03-16 9:43 ` Christoph Hellwig
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=20200309110134.7672-1-kevin.grandemange@allegrodvt.com \
--to=kevin.grandemange@allegrodvt.com \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=robin.murphy@arm.com \
/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).