From: alexander.levin@verizon.com
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: Russell King <rmk+kernel@armlinux.org.uk>, alexander.levin@verizon.com
Subject: [PATCH AUTOSEL for 3.18 25/40] ARM: dma-mapping: disallow dma_get_sgtable() for non-kernel managed memory
Date: Wed, 13 Dec 2017 01:59:17 +0000 [thread overview]
Message-ID: <20171213015905.7059-25-alexander.levin@verizon.com> (raw)
In-Reply-To: <20171213015905.7059-1-alexander.levin@verizon.com>
From: Russell King <rmk+kernel@armlinux.org.uk>
[ Upstream commit 916a008b4b8ecc02fbd035cfb133773dba1ff3d7 ]
dma_get_sgtable() tries to create a scatterlist table containing valid
struct page pointers for the coherent memory allocation passed in to it.
However, memory can be declared via dma_declare_coherent_memory(), or
via other reservation schemes which means that coherent memory is not
guaranteed to be backed by struct pages. In such cases, the resulting
scatterlist table contains pointers to invalid pages, which causes
kernel oops later.
This patch adds detection of such memory, and refuses to create a
scatterlist table for such memory.
Reported-by: Shuah Khan <shuahkhan@gmail.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
arch/arm/mm/dma-mapping.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index e8907117861e..685b6f3b2b8b 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -749,13 +749,31 @@ static void arm_coherent_dma_free(struct device *dev, size_t size, void *cpu_add
__arm_dma_free(dev, size, cpu_addr, handle, attrs, true);
}
+/*
+ * The whole dma_get_sgtable() idea is fundamentally unsafe - it seems
+ * that the intention is to allow exporting memory allocated via the
+ * coherent DMA APIs through the dma_buf API, which only accepts a
+ * scattertable. This presents a couple of problems:
+ * 1. Not all memory allocated via the coherent DMA APIs is backed by
+ * a struct page
+ * 2. Passing coherent DMA memory into the streaming APIs is not allowed
+ * as we will try to flush the memory through a different alias to that
+ * actually being used (and the flushes are redundant.)
+ */
int arm_dma_get_sgtable(struct device *dev, struct sg_table *sgt,
void *cpu_addr, dma_addr_t handle, size_t size,
struct dma_attrs *attrs)
{
- struct page *page = pfn_to_page(dma_to_pfn(dev, handle));
+ unsigned long pfn = dma_to_pfn(dev, handle);
+ struct page *page;
int ret;
+ /* If the PFN is not valid, we do not have a struct page */
+ if (!pfn_valid(pfn))
+ return -ENXIO;
+
+ page = pfn_to_page(pfn);
+
ret = sg_alloc_table(sgt, 1, GFP_KERNEL);
if (unlikely(ret))
return ret;
--
2.11.0
next prev parent reply other threads:[~2017-12-13 2:07 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-13 1:59 [PATCH AUTOSEL for 3.18 01/40] ALSA: hda - add support for docking station for HP 820 G2 alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 03/40] r8152: fix the list rx_done may be used without initialization alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 02/40] cpuidle: Validate cpu_dev in cpuidle_add_sysfs() alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 05/40] net: qmi_wwan: Add USB IDs for MDM6600 modem on Motorola Droid 4 alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 06/40] usb: gadget: f_uvc: Sanity check wMaxPacketSize for SuperSpeed alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 07/40] usb: gadget: udc: remove pointer dereference after free alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 04/40] crypto: deadlock between crypto_alg_sem/rtnl_mutex/genl_mutex alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 11/40] KVM: x86: correct async page present tracepoint alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 10/40] scsi: lpfc: Fix PT2PT PRLI reject alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 09/40] netfilter: nfnl_cthelper: Fix memory leak alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 08/40] netfilter: nfnl_cthelper: fix runtime expectation policy updates alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 14/40] i2c: mux: pca954x: Add missing pca9546 definition to chip_desc alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 13/40] hwmon: (asus_atk0110) fix uninitialized data access alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 12/40] ARM: dts: ti: fix PCI bus dtc warnings alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 15/40] HID: xinmo: fix for out of range for THT 2P arcade controller alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 17/40] net: Do not allow negative values for busy_read and busy_poll sysctl interfaces alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 16/40] s390/qeth: no ETH header for outbound AF_IUCV alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 19/40] irda: vlsi_ir: fix check for DMA mapping errors alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 18/40] i40e: Do not enable NAPI on q_vectors that have no rings alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 23/40] isdn: kcapi: avoid uninitialized data alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 21/40] netfilter: nf_nat_snmp: Fix panic when snmp_trap_helper fails to register alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 22/40] ARM: dts: am335x-evmsk: adjust mmc2 param to allow suspend alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 20/40] netfilter: nfnl_cthelper: fix a race when walk the nf_ct_helper_hash table alexander.levin
2017-12-13 1:59 ` alexander.levin [this message]
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 24/40] xhci: plat: Register shutdown for xhci_plat alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 27/40] backlight: pwm_bl: Fix overflow condition alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 26/40] cpuidle: powernv: Pass correct drv->cpumask for registration alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 31/40] scsi: cxgb4i: fix Tx skb leak alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 30/40] PCI: Avoid bus reset if bridge itself is broken alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 29/40] net: phy: at803x: Change error to EINVAL for invalid MAC alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 28/40] crypto: crypto4xx - increase context and scatter ring buffer elements alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 34/40] PCI/AER: Report non-fatal errors only to the affected endpoint alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 35/40] percpu: don't forget to free the temporary struct pcpu_alloc_info alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 32/40] PCI: Create SR-IOV virtfn/physfn links before attaching driver alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 33/40] igb: check memory allocation failure alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 38/40] scsi: lpfc: PLOGI failures during NPIV testing alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 39/40] fm10k: ensure we process SM mbx when processing VF mbx alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 36/40] powerpc/xmon: Avoid tripping SMP hardlockup watchdog alexander.levin
2017-12-13 13:10 ` Michael Ellerman
2017-12-13 13:44 ` alexander.levin
2018-01-30 4:35 ` Michael Ellerman
2018-02-03 5:58 ` Nicholas Piggin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 37/40] scsi: lpfc: Fix secure firmware updates alexander.levin
2017-12-13 1:59 ` [PATCH AUTOSEL for 3.18 40/40] tcp: fix under-evaluated ssthresh in TCP Vegas alexander.levin
2017-12-21 9:54 ` Greg KH
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=20171213015905.7059-25-alexander.levin@verizon.com \
--to=alexander.levin@verizon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=stable@vger.kernel.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
all inboxes | Powered by JetHome®