linux-kernel - [PATCH] PCI/P2PDMA: Fix NULL check in pci_p2pmem

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20181017160510.17926-1-logang@deltatee.com>
Date:   Wed, 17 Oct 2018 10:05:10 -0600
From:   Logan Gunthorpe <logang@...tatee.com>
To:     linux-kernel@...r.kernel.org, linux-pci@...r.kernel.org
Cc:     Dan Carpenter <dan.carpenter@...cle.com>,
        Logan Gunthorpe <logang@...tatee.com>,
        Bjorn Helgaas <bhelgaas@...gle.com>,
        Christoph Hellwig <hch@...radead.org>
Subject: [PATCH] PCI/P2PDMA: Fix NULL check in pci_p2pmem_publish()

We should only assign 'p2pmem_published' if 'pdev->p2pdma' is not NULL.
The extra check on 'publish' makes no sense.

Signed-off-by: Logan Gunthorpe <logang@...tatee.com>
Reported-by: Dan Carpenter <dan.carpenter@...cle.com>
Cc: Bjorn Helgaas <bhelgaas@...gle.com>
Cc: Christoph Hellwig <hch@...radead.org>
---
 drivers/pci/p2pdma.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index da66c7e31730..d710b5ef65a1 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -678,10 +678,8 @@ EXPORT_SYMBOL_GPL(pci_p2pmem_free_sgl);
  */
 void pci_p2pmem_publish(struct pci_dev *pdev, bool publish)
 {
-	if (publish && !pdev->p2pdma)
-		return;
-
-	pdev->p2pdma->p2pmem_published = publish;
+	if (pdev->p2pdma)
+		pdev->p2pdma->p2pmem_published = publish;
 }
 EXPORT_SYMBOL_GPL(pci_p2pmem_publish);
 
-- 
2.19.0