Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754129AbaJVR06 (ORCPT ); Wed, 22 Oct 2014 13:26:58 -0400 Received: from quartz.orcorp.ca ([184.70.90.242]:57409 "EHLO quartz.orcorp.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752705AbaJVR04 (ORCPT ); Wed, 22 Oct 2014 13:26:56 -0400 Date: Wed, 22 Oct 2014 11:26:46 -0600 From: Jason Gunthorpe To: Jarkko Sakkinen Cc: Peter Huewe , Ashley Lai , Marcel Selhorst , tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, josh.triplett@intel.com, christophe.ricard@gmail.com, jason.gunthorpe@obsidianresearch.com Subject: Re: [PATCH v1 3/3] tpm: fix multiple race conditions in tpm_ppi.c Message-ID: <20141022172646.GD12775@obsidianresearch.com> References: <1413995036-22497-1-git-send-email-jarkko.sakkinen@linux.intel.com> <1413995036-22497-4-git-send-email-jarkko.sakkinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1413995036-22497-4-git-send-email-jarkko.sakkinen@linux.intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Broken-Reverse-DNS: no host name found for IP address 10.0.0.161 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 22, 2014 at 07:23:56PM +0300, Jarkko Sakkinen wrote: > Traversal of the ACPI device tree was not done right. It should lookup > PPI only under the ACPI device that it is associated. Otherwise, it could > match to a wrong PPI interface if there are two TPM devices in the device > tree. > > Removed global ACPI handle and version string from tpm_ppi.c as this > is racy. Instead they should be associated with the chip. > > Moved code just a tiny bit towards two-phase allocation to implement > fix for the PPI race conditions. Not this version.. > Added missing copyright platter to tpm_ppi.c. > > Signed-off-by: Jarkko Sakkinen Reviewed-by: Jason Gunthorpe I like this one the most of the three I've seen :) Did you also look in tpm_acpi.c to see if it needs to use acpi_dev_handle somehow too? > + union acpi_object *obj; > + struct kobject *parent = &chip->dev->kobj; Nit, this variable is only used once, it would be clearer to inline > + /* Cache PPI version string. */ > + obj = acpi_evaluate_dsm_typed(chip->acpi_dev_handle, tpm_ppi_uuid, > + TPM_PPI_REVISION_ID, TPM_PPI_FN_VERSION, > + NULL, ACPI_TYPE_STRING); > + if (obj) { > + strlcpy(chip->ppi_version, obj->string.pointer, > + PPI_VERSION_LEN + 1); > + ACPI_FREE(obj); > + } else > + return -ENOMEM; > + > + return chip->acpi_dev_handle ? > + sysfs_create_group(parent, &ppi_attr_grp) : 0; The above sequence can just be: if (!obj) return -ENOMEM; strlcpy(chip->ppi_version, obj->string.pointer, sizeof(chip->ppi_version)); ACPI_FREE(obj); return sysfs_create_group(&chip->dev->kobj, &ppi_attr_grp); Which is more idiomatic. Also remove TPM_PPI_VERSION_LEN, sizeof is better. I know nothing about acpi, but is ENOMEM the right code? I would think acpi_evalute_dsm_typed would also fail if tpm_ppi_uuid is not found?? > + return chip->acpi_dev_handle ? > + sysfs_create_group(parent, &ppi_attr_grp) : 0; dev_handle is already checked to be non 0 > +void tpm_remove_ppi(struct tpm_chip *chip) > + struct kobject *parent = &chip->dev->kobj; Also used only once Jason -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/