[PATCH v2] vTPM: Fix missing NULL check

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	"Hon Ching(Vicky) Lo" <honclo@linux.vnet.ibm.com>
Newsgroups	linux.kernel
Subject	[PATCH v2] vTPM: Fix missing NULL check
Date	Wed, 15 Mar 2017 06:30:02 +0100
Message-ID	<tl9Fw-2US-9@gated-at.bofh.it> (permalink)
X-Original-To	tpmdd-devel@lists.sourceforge.net
X-Mailer	git-send-email 1.7.1
X-Tm-As-Mml	disable
X-Cbid	17031505-0020-0000-0000-000000CF2C61
X-Ibm-Av-Detection	SAVI=unused REMOTE=unused XFE=unused
X-Cbparentid	17031505-0021-0000-0000-0000028DB1A4
X-Proofpoint-Virus-Version	vendor=fsecure engine=2.50.10432:,, definitions=2017-03-15_01:,, signatures=0
X-Proofpoint-Spam-Details	rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703150043
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	54
Organization	linux.* mail to news gateway
X-Original-Cc	Jason Gunthorpe <jgunthorpe@obsidianresearch.com>, Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, Peter Huewe <PeterHuewe@gmx.de>, Ashley Lai <ashley@ashleylai.com>, Vicky Lo <honclo2014@gmail.com>, linux-kernel@vger.kernel.org, "Hon Ching(Vicky) Lo" <honclo@linux.vnet.ibm.com>, <stable@vger.kernel.org>
X-Original-Date	Wed, 15 Mar 2017 01:28:07 -0400
X-Original-Message-ID	<1489555687-27943-1-git-send-email-honclo@linux.vnet.ibm.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1601059

Show key headers only | View raw

The current code passes the address of tpm_chip as the argument to
dev_get_drvdata() without prior NULL check in
tpm_ibmvtpm_get_desired_dma.  This resulted an oops during kernel
boot when vTPM is enabled in Power partition configured in active
memory sharing mode.

The vio_driver's get_desired_dma() is called before the probe(), which
for vtpm is tpm_ibmvtpm_probe, and it's this latter function that
initializes the driver and set data.  Attempting to get data before
the probe() caused the problem.

This patch adds a NULL check to the tpm_ibmvtpm_get_desired_dma.

fixes: 9e0d39d8a6a0 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
Cc: <stable@vger.kernel.org>
Signed-off-by: Hon Ching(Vicky) Lo <honclo@linux.vnet.ibm.com>
---
 drivers/char/tpm/tpm_ibmvtpm.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index 1b9d61f..f01d083 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -299,6 +299,8 @@ static int tpm_ibmvtpm_remove(struct vio_dev *vdev)
 	}
 
 	kfree(ibmvtpm);
+	/* For tpm_ibmvtpm_get_desired_dma */
+	dev_set_drvdata(&vdev->dev, NULL);
 
 	return 0;
 }
@@ -313,14 +315,16 @@ static int tpm_ibmvtpm_remove(struct vio_dev *vdev)
 static unsigned long tpm_ibmvtpm_get_desired_dma(struct vio_dev *vdev)
 {
 	struct tpm_chip *chip = dev_get_drvdata(&vdev->dev);
-	struct ibmvtpm_dev *ibmvtpm = dev_get_drvdata(&chip->dev);
+	struct ibmvtpm_dev *ibmvtpm;
 
 	/*
 	 * ibmvtpm initializes at probe time, so the data we are
 	 * asking for may not be set yet. Estimate that 4K required
 	 * for TCE-mapped buffer in addition to CRQ.
 	 */
-	if (!ibmvtpm)
+	if (chip)
+		ibmvtpm = dev_get_drvdata(&chip->dev);
+	else
 		return CRQ_RES_BUF_SIZE + PAGE_SIZE;
 
 	return CRQ_RES_BUF_SIZE + ibmvtpm->rtce_size;
-- 
1.7.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] vTPM: Fix missing NULL check "Hon Ching(Vicky) Lo" <honclo@linux.vnet.ibm.com> - 2017-03-15 06:30 +0100
  Re: [PATCH v2] vTPM: Fix missing NULL check Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2017-03-15 17:50 +0100

csiph-web