From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>,
LKML <linux-kernel@vger.kernel.org>
Cc: linux-samsung-soc@vger.kernel.org, "Jan Kara" <jack@suse.cz>,
"Kees Cook" <keescook@chromium.org>,
kvm@vger.kernel.org, "Jason Gunthorpe" <jgg@ziepe.ca>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
linux-pci@vger.kernel.org, linux-mm@kvack.org,
"Jérôme Glisse" <jglisse@redhat.com>,
"John Hubbard" <jhubbard@nvidia.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Daniel Vetter" <daniel.vetter@intel.com>,
"Dan Williams" <dan.j.williams@intel.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org
Subject: [PATCH v5 11/15] PCI: Obey iomem restrictions for procfs mmap
Date: Fri, 30 Oct 2020 11:08:11 +0100 [thread overview]
Message-ID: <20201030100815.2269-12-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20201030100815.2269-1-daniel.vetter@ffwll.ch>
There's three ways to access PCI BARs from userspace: /dev/mem, sysfs
files, and the old proc interface. Two check against
iomem_is_exclusive, proc never did. And with CONFIG_IO_STRICT_DEVMEM,
this starts to matter, since we don't want random userspace having
access to PCI BARs while a driver is loaded and using it.
Fix this by adding the same iomem_is_exclusive() check we already have
on the sysfs side in pci_mmap_resource().
References: 90a545e98126 ("restrict /dev/mem to idle io memory ranges")
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Kees Cook <keescook@chromium.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Jérôme Glisse <jglisse@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: linux-mm@kvack.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-media@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
--
v2: Improve commit message (Bjorn)
---
drivers/pci/proc.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index d35186b01d98..3a2f90beb4cb 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -274,6 +274,11 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
else
return -EINVAL;
}
+
+ if (dev->resource[i].flags & IORESOURCE_MEM &&
+ iomem_is_exclusive(dev->resource[i].start))
+ return -EINVAL;
+
ret = pci_mmap_page_range(dev, i, vma,
fpriv->mmap_state, write_combine);
if (ret < 0)
--
2.28.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-10-30 10:09 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 10:08 [PATCH v5 00/15] follow_pfn and other iomap races Daniel Vetter
2020-10-30 10:08 ` [PATCH v5 01/15] drm/exynos: Stop using frame_vector helpers Daniel Vetter
2020-10-30 10:08 ` [PATCH v5 02/15] drm/exynos: Use FOLL_LONGTERM for g2d cmdlists Daniel Vetter
2020-10-30 10:08 ` [PATCH v5 03/15] misc/habana: Stop using frame_vector helpers Daniel Vetter
2020-10-30 10:08 ` [PATCH v5 04/15] misc/habana: Use FOLL_LONGTERM for userptr Daniel Vetter
2020-10-30 10:08 ` [PATCH v5 05/15] mm/frame-vector: Use FOLL_LONGTERM Daniel Vetter
2020-10-30 14:11 ` Tomasz Figa
2020-10-30 14:37 ` Daniel Vetter
2020-11-02 18:19 ` Tomasz Figa
2020-10-31 2:55 ` John Hubbard
2020-10-31 14:45 ` Daniel Vetter
2020-11-01 5:22 ` John Hubbard
2020-11-01 10:30 ` Daniel Vetter
2020-11-01 21:13 ` John Hubbard
2020-11-01 22:50 ` Daniel Vetter
2020-11-04 14:00 ` Jason Gunthorpe
2020-11-04 15:54 ` Daniel Vetter
[not found] ` <20201104162125.GA13007@infradead.org>
2020-11-04 16:26 ` Daniel Vetter
[not found] ` <20201104163758.GA17425@infradead.org>
[not found] ` <20201104164119.GA18218@infradead.org>
2020-11-04 18:17 ` Jason Gunthorpe
2020-11-04 18:44 ` John Hubbard
2020-11-04 19:02 ` Jason Gunthorpe
2020-11-05 9:25 ` Daniel Vetter
2020-11-05 12:49 ` Jason Gunthorpe
2020-11-06 4:08 ` John Hubbard
2020-11-06 10:01 ` Daniel Vetter
2020-11-06 10:27 ` Daniel Vetter
2020-11-06 12:55 ` Jason Gunthorpe
2020-11-09 8:44 ` Thomas Hellström
2020-11-09 20:19 ` Jason Gunthorpe
2020-11-06 12:58 ` Jason Gunthorpe
2020-10-30 10:08 ` [PATCH v5 06/15] media: videobuf2: Move frame_vector into media subsystem Daniel Vetter
2020-10-30 10:08 ` [PATCH v5 07/15] mm: Close race in generic_access_phys Daniel Vetter
2020-10-30 10:08 ` [PATCH v5 08/15] mm: Add unsafe_follow_pfn Daniel Vetter
[not found] ` <20201102072931.GA16419@infradead.org>
2020-11-02 12:56 ` Daniel Vetter
2020-11-02 13:01 ` Jason Gunthorpe
2020-11-02 13:23 ` Daniel Vetter
2020-11-02 15:52 ` Jason Gunthorpe
2020-11-02 16:42 ` Daniel Vetter
2020-11-02 17:16 ` Jason Gunthorpe
2020-10-30 10:08 ` [PATCH v5 09/15] media/videbuf1|2: Mark follow_pfn usage as unsafe Daniel Vetter
2020-10-30 10:08 ` [PATCH v5 10/15] vfio/type1: Mark follow_pfn " Daniel Vetter
2020-10-30 10:08 ` Daniel Vetter [this message]
2020-11-03 21:28 ` [PATCH v5 11/15] PCI: Obey iomem restrictions for procfs mmap Bjorn Helgaas
2020-11-03 22:09 ` Dan Williams
2020-11-04 8:44 ` Daniel Vetter
2020-11-04 16:50 ` Bjorn Helgaas
2020-11-04 20:12 ` Dan Williams
2020-11-05 9:34 ` Daniel Vetter
2020-10-30 10:08 ` [PATCH v5 12/15] /dev/mem: Only set filp->f_mapping Daniel Vetter
2020-10-30 10:08 ` [PATCH v5 13/15] resource: Move devmem revoke code to resource framework Daniel Vetter
2020-10-31 6:36 ` John Hubbard
2020-10-31 14:40 ` Daniel Vetter
2020-11-03 6:06 ` [resource] 22b17dc667: Kernel panic - not syncing: Fatal exception lkp
2020-11-03 6:15 ` John Hubbard
2020-11-03 10:10 ` Daniel Vetter
2020-10-30 10:08 ` [PATCH v5 14/15] sysfs: Support zapping of binary attr mmaps Daniel Vetter
2020-10-30 10:08 ` [PATCH v5 15/15] PCI: Revoke mappings like devmem Daniel Vetter
2020-10-30 19:22 ` Dan Williams
2020-11-03 21:30 ` Bjorn Helgaas
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=20201030100815.2269-12-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=dan.j.williams@intel.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jack@suse.cz \
--cc=jgg@ziepe.ca \
--cc=jglisse@redhat.com \
--cc=jhubbard@nvidia.com \
--cc=keescook@chromium.org \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-samsung-soc@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;
as well as URLs for NNTP newsgroup(s).