From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2191EC433ED for ; Fri, 23 Apr 2021 05:22:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F171461406 for ; Fri, 23 Apr 2021 05:22:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240636AbhDWFXa (ORCPT ); Fri, 23 Apr 2021 01:23:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240585AbhDWFXR (ORCPT ); Fri, 23 Apr 2021 01:23:17 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E785C061574; Thu, 22 Apr 2021 22:22:41 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4FRN306Gppz9sV5; Fri, 23 Apr 2021 15:22:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1619155358; bh=Yrifz6069QnvvligZ6daMbvydpBwdOtQ+8ZEYsskgIk=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=XUj20bxn/kWYir3ptR9OyYkLict8aqHtca9RjhJmbyiO6Hyp35d4yWmccIj/Fz5Uv KL1WhgEVWDylX/u3MJ9a+p8qs/hYYxAWCM2LxY+GoHvDtsInt4WaM0snN4J+8UwREq 6tYY5/CA4j/fOdYtT/YZRg7yb97pnAy8k9ar2hukPbjCBfzqPggCHr8RutmPr5F59p vfqxGXzy0eFo/ApP1Lt04WdmslugHEOySsl9tvN5MmP1Uui8V73R/EJLXQflyRUKWX H6AqA3LS2ZDNTJ4xqwWlaVFcDzg3TSsISxqL1XZPtqwf+PcdPbGsiHjSsXLtYNCWQg Zs3qCxQO9joXw== Date: Fri, 23 Apr 2021 15:22:36 +1000 From: Stephen Rothwell To: James Bottomley Cc: Jarkko Sakkinen , Jarkko Sakkinen , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the tpmdd tree with Linus' tree Message-ID: <20210423152236.59609c97@canb.auug.org.au> In-Reply-To: References: <20210423123921.181bbb3a@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Zrn519jVXONxS9ZqIkOQnyk"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/Zrn519jVXONxS9ZqIkOQnyk Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi James, On Thu, 22 Apr 2021 22:16:29 -0700 James Bottomley wrote: > > On Fri, 2021-04-23 at 12:39 +1000, Stephen Rothwell wrote: > > diff --cc security/keys/trusted-keys/trusted_tpm2.c > > index c87c4df8703d,d225ad140960..000000000000 > > --- a/security/keys/trusted-keys/trusted_tpm2.c > > +++ b/security/keys/trusted-keys/trusted_tpm2.c > > @@@ -79,7 -245,10 +245,10 @@@ int tpm2_seal_trusted(struct tpm_chip * > > if (i =3D=3D ARRAY_SIZE(tpm2_hash_map)) > > return -EINVAL; > > =20 > > + if (!options->keyhandle) > > + return -EINVAL; > > +=20 > > - rc =3D tpm_buf_init(&buf, TPM2_ST_SESSIONS, TPM2_CC_CREATE); > > + rc =3D tpm_try_get_ops(chip); > > if (rc) > > return rc; =20 >=20 > Yes, that's the right fix, but it should be the one at the top of my > tpmdd-for-next branch. Yeah, I haven't merged that yet. --=20 Cheers, Stephen Rothwell --Sig_/Zrn519jVXONxS9ZqIkOQnyk Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmCCWZwACgkQAVBC80lX 0Gxwowf/QHNXsoX6lxLH3z69+yeDRhaUfRWv6LphCH7T1psqCPBDvVFNW+QBYzG0 i9b5g78s9i7/ar6eOCsQGFTwy6auPWcRQuw9EkRPPjMqOpfsqCYhYPbR3gST6AJv syF+IL+TIrPyzEbjvvRHxJJJp6sD1epoPQk1ZqSrNzoLLAr7SLYhwJNeB6qSKCHF +o2Ku8Lqd/6gWMI+sznY0jzUds+hVH5YOZBqYH1JST87J3HvI0JUFVtY8Mll8kV4 FlLcfOeX/4UeYbZvZvUqeRXWogRfAFkorsrNCZ8lsinsgpXU8zcvFc8sYRLoWn9m 4pQOSHRk1B++2MduWZ22SIZAjVTuIA== =V8Yf -----END PGP SIGNATURE----- --Sig_/Zrn519jVXONxS9ZqIkOQnyk--