Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jonathan McDowell <noodles@fb.com>
To:     Mimi Zohar <zohar@linux.ibm.com>
CC:     Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        "x86@kernel.org" <x86@kernel.org>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
        James Morris <jmorris@namei.org>,
        "Serge E. Hallyn" <serge@hallyn.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-integrity@vger.kernel.org" <linux-integrity@vger.kernel.org>,
        "linux-security-module@vger.kernel.org" 
        <linux-security-module@vger.kernel.org>
Subject: Re: [PATCH] Carry forward IMA measurement log on kexec on x86_64
Thread-Topic: [PATCH] Carry forward IMA measurement log on kexec on x86_64
Thread-Index: AQHYVk//Rm0WwwIkeUGnwDIT6Grq2q0A1peAgAFJh4CAABxEgIAAMeMAgAAXEACAAqbYgA==
Date:   Thu, 28 Apr 2022 10:40:52 +0000
Message-ID: <YmpvJ5JziMS+M3j+@noodles-fedora-PC23Y6EG>
References: <YmKyvlF3my1yWTvK@noodles-fedora-PC23Y6EG>
 <12108732c287a85a417927de37cb027cefae6e06.camel@linux.ibm.com>
 <YmfgyyUs6TgM/Czx@noodles-fedora-PC23Y6EG>
 <41f9d261a7750e576460360c512a8e4c1492efa3.camel@linux.ibm.com>
 <YmgiWpHWH6K1feyt@noodles-fedora-PC23Y6EG>
 <06a1242830ddb84c52cd77e548c71d40a0eb5e63.camel@linux.ibm.com>
In-Reply-To: <06a1242830ddb84c52cd77e548c71d40a0eb5e63.camel@linux.ibm.com>
Accept-Language: en-GB, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?8pNyiOM9cgZIaBJFyOEKeTIlhOEVrUyP0x1P3qcVG3Q+qCMYlIjIHXdMEW6W?=
 =?us-ascii?Q?pkiyHdqd+4s9J6evhJ/5DBDVsEhvyk1px0/kJegPti5UqYnOxo6/IguCKqJD?=
 =?us-ascii?Q?0ItRHqdXd6LZLh5X062ELLJLWgXs30ZimPQbK0b+zip+HEylimqGz2f6DuyQ?=
 =?us-ascii?Q?79NtdTl3JDLc+aTtvqD2FlWa/rSEGPJwQC4lwcxMNs3ckANuro0ASTC9+k3i?=
 =?us-ascii?Q?GBD57Yz6TGK0B4q5UsL0N/Nmpwx7HvZqgpa36rHb8V0OV5ts0GHMAskJAdv3?=
 =?us-ascii?Q?yBvGLInPyYT+SUOmGcvyhX0GI3dz3tOcp6l0qt4KvZfiAhRg7oc37d+mvYJR?=
 =?us-ascii?Q?I9tzEd8Dyii34V0zbELs0pXMOeww2+EM7otHurHFRVGPJgD5SrKTmvKJkLTY?=
 =?us-ascii?Q?eQnQRae+CKq9pSRZIcGJs4RvqLEtubdiuvLk+v/wYBLMybmFoDCWYcEZQb+L?=
 =?us-ascii?Q?Q70FGf4vxrfndovYsHVNpVmIoStl8SMhst2TRRxeKptLrNBBbgrktNxGOgZ5?=
 =?us-ascii?Q?omlSQaJ5jYjSOT9rNHltIOLjf/tnavghfW8bXOCMTIWmTI1wMXMRswmDiXiP?=
 =?us-ascii?Q?5iLYtrFqaZx+bmla3llAbxP4OB45b+EDZgJiLuBAyx+UVURS5/gUEOO0hON2?=
 =?us-ascii?Q?7BrinIoV6lm5fzc+4aFinb+6ry1AON7BTPeDcO+yTlMMH/JDRdhCCz5zR1Ry?=
 =?us-ascii?Q?8Kp2vT/HAxDFTps++Gp+FkCxlRTj6VnjgSCQKqfEebphgT4DUhI2EgqOvOUR?=
 =?us-ascii?Q?YMLuHP9o1b/rCamYu5qRvzHWCRQaBIHeZmOvNDyQ3N5SMk3eQpZIVnM1QAt2?=
 =?us-ascii?Q?rrpFH6Rr+NmTIIXqO6Rq2RbF4xTODULtUMEFf0LzdwenGDDkd1tRSHfbG3vQ?=
 =?us-ascii?Q?FXK6RETH0D8/9SnEdPhKBm6TxFNm1Xu+bsL2gR0jSCMn5e5oKkH5+M4QmHf1?=
 =?us-ascii?Q?DPRnVmGwnx8qSknkXjTdz7JdNeqsWaXN0SUd39VfPJ7hzRJpVrMGc9xaMP4C?=
 =?us-ascii?Q?A4JhYgxF0xGUr+90zr2nNzCsHpuWTNxSaob0N4KLct4TIMck8Qvw9l2Nmmdv?=
 =?us-ascii?Q?c8p7BA2x1pOrGWGmEF1ntxEth7t2ynPKDxEJAfUbGa4iM0i8nApe1587QIaS?=
 =?us-ascii?Q?ayssamRRHnk6aU1kzpmWbSdJs5/Qob4ZtEBLBxRbWifBVWsj9fpLh4ZzmZ6m?=
 =?us-ascii?Q?iIqVF6JpgY0SKhjEQukM3Ej/eZ0ei8WxDFnM+Elaw/G+4SFDVHTDL5b5m9G1?=
 =?us-ascii?Q?1MtjezlDVIfbD82oChRkWb5JW+B11gml3bfvo1RYZwLFw+vRg/P3JQPgqHeK?=
 =?us-ascii?Q?c9mUsm6CPHAzPxjHxlvDuhp1qdpSrVKREgio/YzekelF1y2fQ62GpdAC0fyf?=
 =?us-ascii?Q?6ZHpYNkw/9ICS4AIjGgP2jPdwv9IPw++bndITBEp7Q90RDWK61qpmEfw6BpZ?=
 =?us-ascii?Q?athxXwHvhwHWUCVXkglKUCsiOTFwSEivCaDbhtklP4kg9XieLp8Psfu3Z6lI?=
 =?us-ascii?Q?/LdEN2LSH6XETxOoF8AfTZH7b/eRSAoUFUa0nIGH10180p4jIqSXDIfADXud?=
 =?us-ascii?Q?wuXp76vuyIbkSwzkj/hzuaGoYfo0oMFdndE2eXXfWFi8sNXWKAYc9E3+lQpd?=
 =?us-ascii?Q?Z6KXYenp1YXB7EbEbLEeJs9jh2X+0ZST3hpnRZ7zIZqsNZSdQBOju27p9hRs?=
 =?us-ascii?Q?XUhVfvUo4FpRLsfu3qXfJi75JfsY9k82MXcLx1hxnaUMwQUwanUn2CzSf8Vl?=
 =?us-ascii?Q?s3xuy4yoLQ=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <3CC751F435B93843A55CB02254A95A21@namprd15.prod.outlook.com>
MIME-Version: 1.0
X-OriginatorOrg: fb.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR15MB4552.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: edf22dcc-eda5-486f-4433-08da2903910c
X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Apr 2022 10:40:52.0851
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 2TCWkRJ1+53//tmJjZLhEuasOCOMg+oxmjY1c/3B2BuQ4bASaApeNu5WLN7hlS/V
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY3PR15MB4915
X-Proofpoint-ORIG-GUID: E-6e0f9TS6k3leH5ymep_TzOqjaUciEI
X-Proofpoint-GUID: E-6e0f9TS6k3leH5ymep_TzOqjaUciEI
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514
 definitions=2022-04-28_01,2022-04-28_01,2022-02-23_01
X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Apr 26, 2022 at 02:10:58PM -0400, Mimi Zohar wrote:
> On Tue, 2022-04-26 at 16:48 +0000, Jonathan McDowell wrote:
> > Also there's an issue about the fact that we measure the kexec pieces
> > even if we don't actually do the kexec; there's no marker that confirms
> > the kexec took place. It's separate to this patch (in that it affects
> > the device tree kexec infrastructure too) but it's conceivable that an
> > attacker could measure in the new kernel details and not actually do the
> > kexec, and that's not distinguishable from the kexec happening.
> > 
> > One approach might be to add a marker in the kexec ima buffer such that
> > if it's not present we know the kexec hasn't happened, but I need to
> > think through that a bit more.
> 
> I'm not quite sure what you mean by "we measure the kexec pieces".  The
> kexec file load syscall calls kernel_read_file_from_fd() to read the
> kernel image into a buffer.  The measurement record included in the IMA
> measurement list a hash of the buffer data, which is exactly the same
> as the hash of the kernel image.
> 
> The kernel kexec self tests only do the kexec load, not the execute. 
> For each kexec execute you'll see an additional "boot_aggregate" record
> in the IMA measurement list.  At least for the moment I don't see a
> need for additional marker.

You're right, of course. I'd missed the fact we measure the
boot_aggregate into IMA_MEASURE_PCR_IDX on boot, so although we'll
update PCRs related to the kexec on load the IMA PCR won't get updated
until we've actually done the reboot. So no need for anything extra.

J.