From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.22393.1682606237058364070 for ; Thu, 27 Apr 2023 07:37:17 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=fR3cZV2h; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: jiewen.yao@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682606237; x=1714142237; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=XF0EaZX91TWycuxzcWkxq/0vgo7j+w7b/HLKw09Bo7s=; b=fR3cZV2hqelhco5pB0gDPQknCGdU2P7TuTYR46UbGV06/9GeQCcVb525 vQn+tCOaWlU3y6DrVEfgTKi1DzLqm0LNYKqLcqr0vkPfwg1kc6DD60NBC rTNtrV4LzkEF4vSIhimIpyUnnvhhheW6YC8pJazbrReeuqUayDXwvixhY Oz4tsF3s1ToCizH3sztE6705wzIKBv0A/qqawUSZjhNVFs2iM2ybiwldG 6hk1lwo2vvhFfS4Xu9I9u8U8KCiTYGUbcy6/c4kyHN57tXgVmtInv+5eE f+Lo6ZHR4jJM27UQsCmBq2T0TSsVC5oJ7HcFTlOaOBwSTeNUIfCvziqf8 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10693"; a="347470902" X-IronPort-AV: E=Sophos;i="5.99,230,1677571200"; d="scan'208";a="347470902" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2023 07:37:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10693"; a="727098902" X-IronPort-AV: E=Sophos;i="5.99,230,1677571200"; d="scan'208";a="727098902" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga001.jf.intel.com with ESMTP; 27 Apr 2023 07:37:01 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 27 Apr 2023 07:37:00 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 27 Apr 2023 07:36:59 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Thu, 27 Apr 2023 07:36:59 -0700 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (104.47.74.45) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Thu, 27 Apr 2023 07:36:59 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZUwEkAFKoLpIgWIeyzTwRjg3yGnX7lguhsZll1NmaBhuSXUQQ8hlm6RPQ9SnL/tkGfyHNDFfIgPAiA7EN/ffdtkOnB64Mo3JHHSgufCZnREc7k18oaiA/jgp8g0Ojxg/34UUBEI2nGECdfug2Ci0lQ2tXfW1i9VrV4dvSf9wu+cWWkg5/jU+CCblRXBCpvJYexFAMo70XbxxfaqR1WayiFV6g7pwG8usk+iF9TE+SBuy0bhl/kbe/1LRnQSUv2gNiyNrX9mnutzTNyguHnz5uuZqZ4SOupYx647uCQYJ6CTcwLE2ugZb3ZnMXtgBYcadK3auVlNIubUw0ERikgEL3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fBEE5cJ7TjhuGf1YH5tynGEcwLP+1XCpelan1Z/CaD4=; b=dh+5q1FlZc+jfNllhzUOaEZoh+284HF4wLrm4+xGhZujztMb0NxqntnpBntY8c8C8rrrkOJULRUpRMpccDKhtvKBX8w8wQeIDAUOfdi/v7H2EWUvvU7YcTaizDxc8nVGC6jAqbkavqGfKxiPnlergjAxZnrEkasTg5GaqYiu8SirzuwNJHB0Pf2NXdjL9QEd2N7Pu8phBJ94O4MjPDXbbngV/faWmYmjwdJD5cDbNTiFa0NgISjgV7xmTy9fK0WBOW2vnmFfsSEXyxup2fStXFUKZWC1X81tJuw0Ed1WGJGohdvpBs5OcYxsXLFCX669djDJcIosquHuN6CxOR3ZgA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from MW4PR11MB5872.namprd11.prod.outlook.com (2603:10b6:303:169::14) by SN7PR11MB8281.namprd11.prod.outlook.com (2603:10b6:806:26b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.21; Thu, 27 Apr 2023 14:36:57 +0000 Received: from MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::48e9:aeb0:c365:388]) by MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::48e9:aeb0:c365:388%6]) with mapi id 15.20.6319.022; Thu, 27 Apr 2023 14:36:57 +0000 From: "Yao, Jiewen" To: Gerd Hoffmann , "devel@edk2.groups.io" CC: "Wang, Jian J" , Pawel Polawski , Oliver Steffen Subject: Re: [PATCH 2/2] SecurityPkg: add TIS sanity check (tpm12) Thread-Topic: [PATCH 2/2] SecurityPkg: add TIS sanity check (tpm12) Thread-Index: AQHZeFu3RkuEm5T6Q0qy9qqY/SIBYK8/OqUw Date: Thu, 27 Apr 2023 14:36:57 +0000 Message-ID: References: <20230426162405.653953-1-kraxel@redhat.com> <20230426162405.653953-3-kraxel@redhat.com> In-Reply-To: <20230426162405.653953-3-kraxel@redhat.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MW4PR11MB5872:EE_|SN7PR11MB8281:EE_ x-ms-office365-filtering-correlation-id: 7c6abb56-396b-4ede-00d6-08db472cda88 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Ca+HIK1Sad5bOidEl3dwW96DwvHpIZOK3l+oGctfZAWT3HIaDyrOulHRK+WVQOia1G+7mYM+wjNq9a8sQ4aRrtGn6XYflvekpg96NckMof0V4u1SBvj+0xrBY+bbrtSch5CXBHQtURmC8fre0pFAfm4dvW2i7XKgCK3doTVpJ7miahgEhf5+jStG79v+jQzKOpM4VbLER1Kp339nlW2FEz3D3kixqddIo3QvkRJoI6u178bQblCigkEbtfqxEx/5oE4Zv71h4LDzr8eIlIIACKhSsOOC0a4hc+boGxuHXBQjGpQZeMAV7tSnqTpQcWIZ4S0m2fAgsqmsG0WWdsA96cbQL3l3VDrxanHjlyELfUegHztzc5ELACPS3hoxPI+XOzBjqMypB9XHLSE+FjKEHD914o47sZQ4J0ri4Rdxca0Yo5mT6ZJKau7d2zHcIIlSA81NmCtljH1Kgk+yBizWnBVFJHTS3MWCzi1L6jiF31LgxHAVptYOkkxFtmk4dEt31RU+4Pgtl9uJaE8TAPGT8foI/k88cXTg9wtO+auJhpSmyC1TLv4Qad6UjCVGOqOppCaoplIO5anQ0YdnCfapwmOUkIgoOwhIiQjL8PS8/MBFGPsNruwDgrSOAzx6GuCg x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW4PR11MB5872.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(346002)(366004)(396003)(376002)(39860400002)(451199021)(66446008)(66556008)(66946007)(316002)(66476007)(19627235002)(4326008)(110136005)(54906003)(76116006)(55016003)(5660300002)(15650500001)(82960400001)(52536014)(38070700005)(41300700001)(64756008)(8936002)(8676002)(2906002)(122000001)(38100700002)(186003)(53546011)(26005)(9686003)(6506007)(83380400001)(33656002)(86362001)(478600001)(7696005)(71200400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?y1W7PPe1n+PIZgfCzDCQHVNich1C43iBtExrvypYs3HOJr3+z0l0P0U8puXy?= =?us-ascii?Q?uNA9wsst61sQzq0KjvrekxfVMYiFUUK/rssvrcuJiqAf7VClvYdBmUSoDeQB?= =?us-ascii?Q?oBV3+yQpp7dO/V3Yo2yhcyHjlH8opRzb6oimJqhkKe99SzLTgwqI0i+4Q2HQ?= =?us-ascii?Q?IXAKdQufZXQ7wBMSALZnewfNvr4Kg2ilnRnp7U8ngf9x2Mki2WwGAKhWU3Hj?= =?us-ascii?Q?w3EGcntHoms7ZlHHEAkgByhTibPKTS4t6Xr9M4H+4YlGUk1i0xrlflJGKeQD?= =?us-ascii?Q?nhWJTShGD1u67sW1UDpmABVb4bzFrLUrF7SbXHcVOlcQe/1MS3l9OkHCBLus?= =?us-ascii?Q?aJiUcP2OYKJFh03T22jFeaVMF8FCfyNhSmSf+eg3HPLPf4freqd7K/zp0Z9K?= =?us-ascii?Q?9RyV4X95Lj0kOEzG6Kndq6l5qludD/C2q4sFteOWRVJJaMqmlfH39HSJ5Qra?= =?us-ascii?Q?IgzjyHz+o1rfbmzV0zN8HfKxv28nSqPQMBHYpV6m3eIRj2hU7Tk6QGPjWrmv?= =?us-ascii?Q?9CwX6QxbhdioosB5iGKydSSu128phGnJVPU2kxEkdHVkScpdK+eHtu+sWAwj?= =?us-ascii?Q?QLRp3/ePsanWKNYmAjj2NerdJBspc811aDnC+LsIP1nRKZ43NvVyhbFaLKV0?= =?us-ascii?Q?NWp7bZiytRVUbJoa0R63RB4/qj44xmkH3rmdp5jR23jNYZpVaeoO2cGQAsUP?= =?us-ascii?Q?s6sWtsyves3x0ou8PquIP0l70unWqw9ohK0uVOx9duGlL9uxcGpUx561wmTs?= =?us-ascii?Q?3Ffz23I5C1CGBI6Xi1+xuaODdzcXZu7pi4/Jq843qBNFOdWF1k4WJoS689lV?= =?us-ascii?Q?fADUnIBMLte93tJB3UCIJbt/TugX+goWY9z2L6QXenCTXsoAksNPXV29DwSU?= =?us-ascii?Q?UUFSQYI0TAQs6CZHGLiIG/cO+LqrGuwA53aMX1nM7NkzCnoRuVv1v4kzf9Z3?= =?us-ascii?Q?2yBT5bfDO0UVbv6tyzodAw1kwaGKy+4IeHyB+2TWoS3Jrev0tAm+oP8WVAjr?= =?us-ascii?Q?ajQCOEVzak13JYvLwe7dXJk4zMprGVxnQIovfKOIov3VTn7XJIjxQK6TV2Hq?= =?us-ascii?Q?DmnPUhzV4FZxSLrbf5vjSA6GNwbxn+gg+wUWmpdGn85VxyVvQOqsKmRr88s6?= =?us-ascii?Q?rTdpCs3wIZAdys7DSF/NYLWRkihC48XLZ3aBlOnhGgOIipcHfzCH6yYTqi2j?= =?us-ascii?Q?LtEvpemwxhRF0rDR6l1q/UIZbPQSAjrpq571O4xu9N1p82X5TJtFaF4aP9FG?= =?us-ascii?Q?6YLfRGUfHQhqdHAneYMynev2/9oKe6bA3fsXqVItjPhJIy+j2YU10ryoOxrL?= =?us-ascii?Q?FiQywnxcCbFUZUJ/Gpy29jd5/6UppC7eSPSR7e4qfYpGrfOMLWFGYrosVPF3?= =?us-ascii?Q?JVbA/5eD6HMvR9khFcW5E1FnW5vUtRkZmpC0wFcDTdxFw6onklM9dC8wOsR/?= =?us-ascii?Q?2DZgERCEpK92aayIvsBoEoDnRNdOqN8MBx2PSpGl0HNpeZVe+nIndlwPgdq5?= =?us-ascii?Q?PvwHrFSvOoVQHQv8fPjkXY9G7T+WvGsqZ4NE0j473076MT2gaI3KDy5bikAv?= =?us-ascii?Q?vOSFmc3wxfn/n/Eq5al/XK3pR21/Mw4YeVnwEUMC?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5872.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c6abb56-396b-4ede-00d6-08db472cda88 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Apr 2023 14:36:57.3521 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: R97AothcBlvPeI1ryNGVj/fs1Dpbclzobbe3ffsTddzFKRcsMIXKMOQIDJzYlBjaI0sRAP/NZrgJOJiZuku8fg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB8281 Return-Path: jiewen.yao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jiewen Yao > -----Original Message----- > From: Gerd Hoffmann > Sent: Thursday, April 27, 2023 12:24 AM > To: devel@edk2.groups.io > Cc: Wang, Jian J ; Pawel Polawski > ; Oliver Steffen ; Yao, > Jiewen ; Gerd Hoffmann > Subject: [PATCH 2/2] SecurityPkg: add TIS sanity check (tpm12) >=20 > The code blindly assumes a TIS interface is present in case both CRB and > FIFO checks fail. Check the InterfaceType for TIS instead and only > return PtpInterfaceTis in case it matches, PtpInterfaceMax otherwise. >=20 > Signed-off-by: Gerd Hoffmann > --- > SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) >=20 > diff --git a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c > b/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c > index 51f43591287a..d2b79a274084 100644 > --- a/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c > +++ b/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c > @@ -91,7 +91,11 @@ Tpm12GetPtpInterface ( > return PtpInterfaceFifo; > } >=20 > - return PtpInterfaceTis; > + if (InterfaceId.Bits.InterfaceType =3D=3D > PTP_INTERFACE_IDENTIFIER_INTERFACE_TYPE_TIS) { > + return PtpInterfaceTis; > + } > + > + return PtpInterfaceMax; > } >=20 > /** > -- > 2.40.0