From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Eric Yang <yu.yang_3@nxp.com>, iommu@lists.linux-foundation.org
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
David Miller <davem@davemloft.net>,
Ingo Molnar <mingo@kernel.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Al Viro <viro@zeniv.linux.org.uk>,
Kees Cook <keescook@chromium.org>,
Daniel Borkmann <daniel@iogearbox.net>
Subject: Re: No check of the size passed to unmap_single in swiotlb
Date: Mon, 20 Nov 2017 11:26:52 -0500 [thread overview]
Message-ID: <20171120162652.GR24312@char.us.oracle.com> (raw)
In-Reply-To: <VI1PR04MB30715EA7212DC661481041438C220@VI1PR04MB3071.eurprd04.prod.outlook.com>
On Mon, Nov 20, 2017 at 08:17:14AM +0000, Eric Yang wrote:
> Hi all,
Hi!
>
> During debug a device only support 32bits DMA(Qualcomm Atheros AP) in our LS1043A 64bits ARM SOC, we found that the invoke of dma_unmap_single --> swiotlb_tbl_unmap_single will unmap the passed "size" anyway even when the "size" is incorrect.
>
> If the size is larger than it should, the extra entries in io_tlb_orig_addr array will be refilled by INVALID_PHYS_ADDR, and it will cause the bounce buffer copy not happen when the one who really used the mis-freed entries doing DMA data transfers, and this will cause further unknow behaviors.
>
> Here we just fix it temporarily by adding a judge of the "size" in the swiotlb_tbl_unmap_single, if it is larger than it deserves, just unmap the right size only. Like the code:
Did the DMA debug API (CONFIG_DMA_API_DEBUG) help in figuring this issue as well?
>
> [yangyu@titan dash-lts]$ git diff ./lib/swiotlb.c
> diff --git a/lib/swiotlb.c b/lib/swiotlb.c
> index ad1d2962d129..58c97ede9d78 100644
> --- a/lib/swiotlb.c
> +++ b/lib/swiotlb.c
> @@ -591,7 +591,10 @@ void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,
> */
> for (i = index + nslots - 1; i >= index; i--) {
> io_tlb_list[i] = ++count;
> - io_tlb_orig_addr[i] = INVALID_PHYS_ADDR;
> + if(io_tlb_orig_addr[i] != orig_addr)
> + printk("======size wrong, ally down ally down!===\n");
> + else
> + io_tlb_orig_addr[i] = INVALID_PHYS_ADDR;
> }
> /*
> * Step 2: merge the returned slots with the preceding slots,
>
> Although pass a right size of DMA buffer is the responsibility of the drivers, but Is it useful to add some size check code to prevent real damage happen?
>
> Regards,
> Eric
next prev parent reply other threads:[~2017-11-20 16:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-20 8:17 Eric Yang
2017-11-20 16:26 ` Konrad Rzeszutek Wilk [this message]
2017-11-20 16:50 ` Robin Murphy
2017-11-23 9:08 ` Eric Yang
2017-11-24 13:33 ` Konrad Rzeszutek Wilk
2017-11-28 14:18 ` Robin Murphy
2017-11-30 3:05 ` Eric Yang
2017-11-22 3:23 ` Eric Yang
2017-11-22 13:15 ` Robin Murphy
2017-11-23 7:47 ` Eric Yang
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=20171120162652.GR24312@char.us.oracle.com \
--to=konrad.wilk@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=geert+renesas@glider.be \
--cc=gregkh@linuxfoundation.org \
--cc=iommu@lists.linux-foundation.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=yu.yang_3@nxp.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
Powered by JetHome