Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp822652pxb; Tue, 3 Nov 2020 13:32:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZ71AR2ZMUFWYJEGh+5Rso4F7q6BQnP5lUKF2stJDyjkCsKT9ykjmh/vVxerbOYX6z3zhB X-Received: by 2002:a17:906:7f95:: with SMTP id f21mr21157188ejr.340.1604439154287; Tue, 03 Nov 2020 13:32:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604439154; cv=none; d=google.com; s=arc-20160816; b=c0H3zRggOLMQmpeBNGMrkBvhtnDa55IadjjLcLVfcXk0QwxowUx80Lfdg/nlEsZ+t3 9HAR6/QuQOrq3BaQki4nBATi6w9rqJcrpOSKB2fOyfRn47l2MN/r6xqYqNzgBm6O4ZB0 hZnEzfjKC7dh95b9siVlSJBccAyNvShQpz7nnvnUz6Lkn37qYbgD0V7LUIUfeGPbkzZp VyVZyXnAM12CIhsYw8ZeLrnVdveA2xZFDlo7R9rJtMJ+OOMvCcbcOO/iaPDKsoeZL4C3 0SH+pVDBMHr2011HhDAbOm67/rs1MVp55yomNb2upvKzOkRgvkUeBDmWwR8K+75JvRNK +IpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=yhkhhC/KP1umdWrRf1BNWLzdeVgA9GA64xMlw4uE6t4=; b=adR1hrTINwQ+cv3NEYLwUNvipZzc6hCXedcGgvrsoEvd9vyidNBwQeOvB3ZLVbMyLl o1gHSPpd20JO8tMum+tbZIrquSK+QdPcQg3Gz5q4Y8H8JQo3xMcdhOkqJNJIcw8pNgHO xnrFCPUPJLJDVg3eWOUR4tHz3CfgT9tC1hzr7fof4CUObo+oOyQMtCh8QlDRxA5SkRYX V4nH4hrVUSPl67sJm4Gd8s6OwecF/NQvtQqnnx0Gq9oNbf+sTwtSMk7p9GIpXJ5io9rN vTkAnCeF+K5SHcTf4yddeA1mR0QdxvuYdEOHZHJlpLXcomoOFDc40CsCivNZ+9rS4IlU tkaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="r3rNM/R7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v4si11070101edl.447.2020.11.03.13.32.11; Tue, 03 Nov 2020 13:32:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="r3rNM/R7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388286AbgKCV2o (ORCPT + 99 others); Tue, 3 Nov 2020 16:28:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:47284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731845AbgKCV2m (ORCPT ); Tue, 3 Nov 2020 16:28:42 -0500 Received: from localhost (230.sub-72-107-127.myvzw.com [72.107.127.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8D35D2074B; Tue, 3 Nov 2020 21:28:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604438921; bh=8ytUCsyZVeF3ujFgYm5L1sW7UkyVhphiOKLK38YXOJo=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=r3rNM/R7N18tFkDui7jKc1s7Rf1w4AGB0oy4QLfqljsFx0cgfbQoVLb4YXPv8FJ21 3GOcK6tXRCXbaRCS5TJewrPlPhPnEk4+UMQFmaSlDABV6b/XkOfyrQcMw74G4iOpe0 oHBd90d8NCZ7lRYb6RIVYqEyC0t2dJj32/rqukig= Date: Tue, 3 Nov 2020 15:28:40 -0600 From: Bjorn Helgaas To: Daniel Vetter Cc: DRI Development , LKML , kvm@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-media@vger.kernel.org, Daniel Vetter , Jason Gunthorpe , Kees Cook , Dan Williams , Andrew Morton , John Hubbard , =?iso-8859-1?B?Suly9G1l?= Glisse , Jan Kara , Bjorn Helgaas , linux-pci@vger.kernel.org Subject: Re: [PATCH v5 11/15] PCI: Obey iomem restrictions for procfs mmap Message-ID: <20201103212840.GA266427@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201030100815.2269-12-daniel.vetter@ffwll.ch> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Oct 30, 2020 at 11:08:11AM +0100, Daniel Vetter wrote: > 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 This is OK with me but it looks like IORESOURCE_EXCLUSIVE is currently only used in a few places: e1000_probe() calls pci_request_selected_regions_exclusive(), ne_pci_probe() calls pci_request_regions_exclusive(), vmbus_allocate_mmio() calls request_mem_region_exclusive() which raises the question of whether it's worth keeping IORESOURCE_EXCLUSIVE at all. I'm totally fine with removing it completely. But if you want it, Acked-by: Bjorn Helgaas > Cc: Jason Gunthorpe > Cc: Kees Cook > Cc: Dan Williams > Cc: Andrew Morton > Cc: John Hubbard > Cc: J?r?me Glisse > Cc: Jan Kara > Cc: Dan Williams > 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 > Cc: linux-pci@vger.kernel.org > Signed-off-by: Daniel Vetter > -- > 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 >