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=-5.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 AFC48C4360C for ; Wed, 25 Sep 2019 16:41:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 90C2621D7A for ; Wed, 25 Sep 2019 16:41:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391921AbfIYQlw (ORCPT ); Wed, 25 Sep 2019 12:41:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51187 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391884AbfIYQlw (ORCPT ); Wed, 25 Sep 2019 12:41:52 -0400 Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CE4023295 for ; Wed, 25 Sep 2019 16:41:51 +0000 (UTC) Received: by mail-io1-f72.google.com with SMTP id w8so336414iod.21 for ; Wed, 25 Sep 2019 09:41:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:reply-to :mail-followup-to:references:mime-version:content-disposition :in-reply-to:user-agent; bh=zugf//ewV+Jw24YzObP86wfqOVJcB6V6OI1o/yrHlEY=; b=U0DRJRZj0OI8/ti5nMGwCXC27i/WhQdYG70IQknuhltcb8WnAGGo0eVBG7jcP5tc9t vbYYm+JOWd8Uu1nlYGj1QxGmpN7+p0Rkh2g+Xpz74YYsWWST/vtTU09gn7ZdsETC9zdh jHpSZXHLsuzx4BZXBIHXxiTuKnkytctp+BiJxvsezpJvOtnW939rn97beUG+SuLCQrPV MzexOM3ooFnP1DF1deiGmo6dO3h7CAxyH3VYkPYbRDrHpWDAxeFUePyz5OoO+Pos8YZw 3nrgOnN4hdrW7RrT1qAT7Fyco5bdDCW4FrB8Hv2zs1G0vgo+MSIxmFmHuLQgD9+RnDYO OCpg== X-Gm-Message-State: APjAAAU/yqVc+Yty4hF3OteSvuc6wCbuuzCWsPegrLbFZGV85gHHiu/S /Iq+L2jSbiZy5k3fyUmEWfAm+qC5bogMVob2x1pZLpfhm/OJbti4Bb/g5lEGmXIf6dCE7RNeRSX 7HkjhgE36qTechMkRXiM7Ro6r X-Received: by 2002:a92:4648:: with SMTP id t69mr1134276ila.282.1569429710867; Wed, 25 Sep 2019 09:41:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqz3k+VJoIZBpJcMr4uiRsUW3+00NWKVfMoehoDepoQvH5UxKHKV1XUTS9DES9bMTghkTTPc5Q== X-Received: by 2002:a92:4648:: with SMTP id t69mr1134255ila.282.1569429710588; Wed, 25 Sep 2019 09:41:50 -0700 (PDT) Received: from localhost (ip70-163-223-149.ph.ph.cox.net. [70.163.223.149]) by smtp.gmail.com with ESMTPSA id c6sm52396iom.34.2019.09.25.09.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 09:41:49 -0700 (PDT) Date: Wed, 25 Sep 2019 09:41:33 -0700 From: Jerry Snitselaar To: Jarkko Sakkinen , Ard Biesheuvel , linux-integrity , Peter Jones , linux-efi , stable , Lyude Paul , Matthew Garrett , Roberto Sassu , Bartosz Szczepanek , open list Subject: Re: [PATCH v2 1/2] efi+tpm: Don't access event->count when it isn't mapped. Message-ID: <20190925164133.nmzzhwgagpqvwclu@cantor> Reply-To: Jerry Snitselaar Mail-Followup-To: Jarkko Sakkinen , Ard Biesheuvel , linux-integrity , Peter Jones , linux-efi , stable , Lyude Paul , Matthew Garrett , Roberto Sassu , Bartosz Szczepanek , open list References: <20190925101622.31457-1-jarkko.sakkinen@linux.intel.com> <20190925145011.GC23867@linux.intel.com> <20190925151616.3glkehdrmuwtosn3@cantor> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20190925151616.3glkehdrmuwtosn3@cantor> User-Agent: NeoMutt/20180716 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed Sep 25 19, Jerry Snitselaar wrote: >On Wed Sep 25 19, Jarkko Sakkinen wrote: >>On Wed, Sep 25, 2019 at 12:25:05PM +0200, Ard Biesheuvel wrote: >>>On Wed, 25 Sep 2019 at 12:16, Jarkko Sakkinen >>> wrote: >>>> >>>> From: Peter Jones >>>> >>>> Some machines generate a lot of event log entries. When we're >>>> iterating over them, the code removes the old mapping and adds a >>>> new one, so once we cross the page boundary we're unmapping the page >>>> with the count on it. Hilarity ensues. >>>> >>>> This patch keeps the info from the header in local variables so we don't >>>> need to access that page again or keep track of if it's mapped. >>>> >>>> Fixes: 44038bc514a2 ("tpm: Abstract crypto agile event size calculations") >>>> Cc: linux-efi@vger.kernel.org >>>> Cc: linux-integrity@vger.kernel.org >>>> Cc: stable@vger.kernel.org >>>> Signed-off-by: Peter Jones >>>> Tested-by: Lyude Paul >>>> Reviewed-by: Jarkko Sakkinen >>>> Acked-by: Matthew Garrett >>>> Acked-by: Ard Biesheuvel >>>> Signed-off-by: Jarkko Sakkinen >>> >>>Thanks Jarkko. >>> >>>Shall I take these through the EFI tree? >> >>Would be great, if you could because I already sent one PR with fixes for >>v5.4-rc1 yesterday. >> >>/Jarkko > >My patch collides with this, so I will submit a v3 that applies on top of >these once I've run a test with all 3 applied on this t480s. Tested with Peter's patches, and that was the root cause on this 480s. I think there should still be a check for tbl_size to make sure we aren't sticking -1 into efi_tpm_final_log_size though, which will be the case right now if it fails to parse an event.