From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarkko Sakkinen Subject: Re: [PATCH 1/2] tpm: Check for parent device being NULL Date: Fri, 18 Nov 2016 07:52:00 -0800 Message-ID: <20161118155200.czodzutm72aqfb77@intel.com> References: <1479429004-7962-1-git-send-email-stefanb@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1479429004-7962-1-git-send-email-stefanb-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: tpmdd-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: Stefan Berger Cc: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: tpmdd-devel@lists.sourceforge.net On Thu, Nov 17, 2016 at 07:30:03PM -0500, Stefan Berger wrote: > Check for the parent device being NULL before accessing it. This > prevents crashed with the vtpm_proxy driver, since this driver > does not have a parent device. > > Signed-off-by: Stefan Berger > --- > drivers/char/tpm/tpm_of.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c > index 36df9df..72c282e 100644 > --- a/drivers/char/tpm/tpm_of.c > +++ b/drivers/char/tpm/tpm_of.c > @@ -29,7 +29,7 @@ int tpm_read_log_of(struct tpm_chip *chip) > struct tpm_bios_log *log; > > log = &chip->log; > - if (chip->dev.parent->of_node) > + if (chip->dev.parent && chip->dev.parent->of_node) > np = chip->dev.parent->of_node; > else > return -ENODEV; > -- > 2.4.3 CC to linux-security-module LGTM Reviewed-by: Jarkko Sakkinen /Jarkko ------------------------------------------------------------------------------