Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD260C4706C for ; Fri, 12 Jan 2024 17:43:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOLYZ-0005oc-GH; Fri, 12 Jan 2024 12:42:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3G3qhZQgKCsgo5rp+uw7u22uzs.q20u58p-rs9szu18.25u@flex--ardb.bounces.google.com>) id 1rOLYX-0005nC-Kl for grub-devel@gnu.org; Fri, 12 Jan 2024 12:42:57 -0500 Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3G3qhZQgKCsgo5rp+uw7u22uzs.q20u58p-rs9szu18.25u@flex--ardb.bounces.google.com>) id 1rOLYU-0000wT-FR for grub-devel@gnu.org; Fri, 12 Jan 2024 12:42:56 -0500 Received: by mail-wm1-x349.google.com with SMTP id 5b1f17b1804b1-40d5ab2fbc9so50906285e9.3 for ; Fri, 12 Jan 2024 09:42:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1705081372; x=1705686172; darn=gnu.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=cjIfzDRSCSVxscW0/pWPNMGTQ8krgdTYCbgiwl+uoNM=; b=SBK5X0iHq6Hr+vLPYM1IW528X1puk8B/Oddud9Wml8OlPQrP0batieGakS8okaaUcf O2PDyOrgyy8bds35cY5szK2SRLoLIcAayIvPBp8pb6CsG6E9oRjgby4i3hrdX7HMXnZl FkY995nmUGbdaqe+od+LYSnd0n11QqilJGUGnewy1WQFnec/nz05lOJiJUXWfJe3josh hthJkNDuSP8shNNz3gllL5wmcgEvJrwwaZfjQVSrpe/qG/IcQF4La+hSoHL2djtUtImd vM/ddQr3KeQ+B0TG5B5BHtlW63B1Z7p239BK3sIDeW7bJRb2D3IEzcWY+Kuvm9VhyIQo LyWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705081372; x=1705686172; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=cjIfzDRSCSVxscW0/pWPNMGTQ8krgdTYCbgiwl+uoNM=; b=a747HGLOb18yEJVQdEk8bv08RXcNGYRbU+uNUH2hQQ0cI7iS61wtYbVrFG5ygJFHtO OKYibzl/KlOAOUPUBEFtoq2t3HFvIb8X+4xKXnhaxlQBBxamRMmx99bZuazDRCnhNaKO QDRzrBv/JHPgVPqK9UAfCmzMfR57e4Xs2gDOab0LP06+CDZHEfoJi43ym0PIekvP8KcX FH3C2gBMO9PQUX9UHz4q87UPomDzR3SoG2PI6UzNKN+ZxsImzWiY8QDjJOeTFQM6Qxvg kSXe206yHpALY2ZU4YJLJhUxaPW/tdE5Wh2YAf3glL076n+tIFYty2VPUnMCmSMtWARq 0vfQ== X-Gm-Message-State: AOJu0YwuQWB8POqRE9yzJk1E6Nom1EOU9WuZeMSD0R2kVbLHgmcC0eyf AYPKoB4EGuM9WA7D0pdnfPMLb9bYKYBL5oW+AFwSkmSTBHAKAXzJxaLPUsfdo2ixEdHjl9H4o2i ZwHtZxQAHIDP0dTj8Q2iD/WrwiRJ6x/31rRAwPrTOYOMnEy6WUBbigKr/Pw== X-Google-Smtp-Source: AGHT+IEwkYa7nuAhl2tvHMhMOmjMNUxmbKpXYVGg18Mxeiow60/PfLTPwloWK1NiXCIRXFrz4hSudVmu X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:600c:444e:b0:40e:532c:7caf with SMTP id v14-20020a05600c444e00b0040e532c7cafmr34256wmn.6.1705081371893; Fri, 12 Jan 2024 09:42:51 -0800 (PST) Date: Fri, 12 Jan 2024 18:42:19 +0100 Mime-Version: 1.0 X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=4528; i=ardb@kernel.org; h=from:subject; bh=yW9i0XxpOeuodR+K1HecC3TbcLL58veZTCpYnzDLw+M=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIXVh5e/Du4ximcM/zLjFHB1VGTXr5YeY1vW7rLm3uaqc+ MWl6abWUcrCIMbBICumyCIw+++7nacnStU6z5KFmcPKBDKEgYtTACaiac7IcJaHrfLb5uYOhWkT Hr+Y9ezi91996sv6v4g9e/z8eObVTysZ/tn1Liqw+T5nVgTnVe6OzvDv5y6v02re47Hztv/jjNv X1nACAA== X-Mailer: git-send-email 2.43.0.275.g3460e3d667-goog Message-ID: <20240112174218.1076052-2-ardb+git@google.com> Subject: [PATCH v2] efi: Fix stack protector issues To: grub-devel@gnu.org Received-SPF: pass client-ip=2a00:1450:4864:20::349; envelope-from=3G3qhZQgKCsgo5rp+uw7u22uzs.q20u58p-rs9szu18.25u@flex--ardb.bounces.google.com; helo=mail-wm1-x349.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Ard Biesheuvel via Grub-devel Reply-To: The development of GNU GRUB Cc: Ard Biesheuvel , Ard Biesheuvel , Glenn Washburn , Daniel Kiper Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: grub-devel-bounces+grub-devel=archiver.kernel.org@gnu.org Sender: grub-devel-bounces+grub-devel=archiver.kernel.org@gnu.org RnJvbTogQXJkIEJpZXNoZXV2ZWwgPGFyZGJAa2VybmVsLm9yZz4KClRoZSAnZ3JvdW5kIHRydXRo JyBzdGFjayBwcm90ZWN0b3IgY29va2llIHZhbHVlIGlzIGtlcHQgaW4gYSBnbG9iYWwKdmFyaWFi bGUsIGFuZCBsb2FkZWQgaW4gZXZlcnkgZnVuY3Rpb24gcHJvbG9ndWUgYW5kIGVwaWxvZ3VlIHRv IHN0b3JlCml0IGludG8gcmVzcC4gY29tcGFyZSBpdCB3aXRoIHRoZSBzdGFjayBzbG90IGhvbGRp bmcgdGhlIGNvb2tpZS4KCklmIHRoZSBjb21wYXJpc29uIGZhaWxzLCB0aGUgcHJvZ3JhbSBhYm9y dHMsIGFuZCB0aGlzIG1pZ2h0IG9jY3VyCnNwdXJpb3VzbHkgd2hlbiB0aGUgZ2xvYmFsIHZhcmlh YmxlIGNoYW5nZXMgdmFsdWVzIGJldHdlZW4gdGhlIGVudHJ5IGFuZApleGl0IG9mIGEgZnVuY3Rp b24uIFRoaXMgaW1wbGllcyB0aGF0IGFzc2lnbmluZyB0aGUgZ2xvYmFsIHZhcmlhYmxlIGF0CmJv b3Qgc2hvdWxkIG5vdCBpbnZvbHZlIGFueSBpbnN0cnVtZW50ZWQgZnVuY3Rpb24gY2FsbHMsIHVu bGVzcyBzcGVjaWFsCmNhcmUgaXMgdGFrZW4gdG8gZW5zdXJlIHRoYXQgdGhlIGxpdmUgY2FsbCBz dGFjayBpcyBzeW5jaHJvbml6ZWQsIHdoaWNoCmlzIG5vbi10cml2aWFsLgoKU28gYXZvaWQgYW55 IGZ1bmN0aW9uIGNhbGxzLCBpbmNsdWRpbmcgZ3J1Yl9tZW1jcHkoKSwgd2hpY2ggaXMKdW5uZWNl c3NhcnkgZ2l2ZW4gdGhhdCB0aGUgc3RhY2sgY29va2llIGlzIGFsd2F5cyBhIHN1aXRhYmx5IGFs aWduZWQKdmFyaWFibGUgb2YgdGhlIG5hdGl2ZSB3b3JkIHNpemUuCgpXaGlsZSBhdCBpdCwgbGVh dmUgdGhlIGxhc3QgYnl0ZSAweDAgdG8gYXZvaWQgaW5hZHZlcnRlbnQgdW5ib3VuZGVkCnN0cmlu Z3Mgb24gdGhlIHN0YWNrLgoKTm90ZSB0aGF0IHRoZSB1c2Ugb2YgX19hdHRyaWJ1dGVfXygob3B0 aW1pemUpKSBpcyBkZXNjcmliZWQgYXMKdW5zdWl0YWJsZSBmb3IgcHJvZHVjdGlvbiB1c2UgaW4g dGhlIEdDQyBkb2N1bWVudGF0aW9uLCBzbyBsZXQncyBkcm9wCnRoaXMgYXMgd2VsbCBub3cgdGhh dCBpdCBpcyBubyBsb25nZXIgbmVlZGVkLgoKQ2M6IEdsZW5uIFdhc2hidXJuIDxkZXZlbG9wbWVu dEBlZmZpY2llbnRlay5jb20+CkNjOiBEYW5pZWwgS2lwZXIgPGRraXBlckBuZXQtc3BhY2UucGw+ ClNpZ25lZC1vZmYtYnk6IEFyZCBCaWVzaGV1dmVsIDxhcmRiQGtlcm5lbC5vcmc+Ci0tLQp2MjoK LSBpbml0IHN0YWNrIGd1YXJkIGJlZm9yZSBtYWNoaW5lIGluaXQKLSB1cGRhdGUgY29tbWl0IGxv ZyB0byBleHBsYWluIHRoYXQgaXQgaXMgcG9zc2libGUgaW4gdGhlb3J5IHRvIGZpeCB1cCBhCiAg bGl2ZSBjYWxsIHN0YWNrCgogZ3J1Yi1jb3JlL2tlcm4vZWZpL2luaXQuYyAgICAgIHwgMjcgKysr KysrLS0tLS0tLS0tLS0tLS0KIGdydWItY29yZS9rZXJuL21haW4uYyAgICAgICAgICB8ICA1ICsr KysKIGluY2x1ZGUvZ3J1Yi9zdGFja19wcm90ZWN0b3IuaCB8IDEzICsrKysrKysrKysKIDMgZmls ZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZ3J1Yi1jb3JlL2tlcm4vZWZpL2luaXQuYyBiL2dydWItY29yZS9rZXJuL2VmaS9pbml0LmMK aW5kZXggNmM1NGFmNmU3Li4xNjM3MDc3ZTEgMTAwNjQ0Ci0tLSBhL2dydWItY29yZS9rZXJuL2Vm aS9pbml0LmMKKysrIGIvZ3J1Yi1jb3JlL2tlcm4vZWZpL2luaXQuYwpAQCAtMzksMTIgKzM5LDYg QEAgc3RhdGljIGdydWJfZWZpX2NoYXIxNl90IHN0YWNrX2Noa19mYWlsX21zZ1tdID0KIAogc3Rh dGljIGdydWJfZ3VpZF90IHJuZ19wcm90b2NvbF9ndWlkID0gR1JVQl9FRklfUk5HX1BST1RPQ09M X0dVSUQ7CiAKLS8qCi0gKiBEb24ndCBwdXQgdGhpcyBvbiBncnViX2VmaV9pbml0KCkncyBsb2Nh bCBzdGFjayB0byBhdm9pZCBpdAotICogZ2V0dGluZyBhIHN0YWNrIGNoZWNrLgotICovCi1zdGF0 aWMgZ3J1Yl9lZmlfdWludDhfdCBzdGFja19jaGtfZ3VhcmRfYnVmWzMyXTsKLQogLyogSW5pdGlh bGl6ZSBjYW5hcnkgaW4gY2FzZSB0aGVyZSBpcyBubyBSTkcgcHJvdG9jb2wuICovCiBncnViX2Fk ZHJfdCBfX3N0YWNrX2Noa19ndWFyZCA9IChncnViX2FkZHJfdCkgR1JVQl9TVEFDS19QUk9URUNU T1JfSU5JVDsKIApAQCAtNzcsOCArNzEsOCBAQCBfX3N0YWNrX2Noa19mYWlsICh2b2lkKQogICB3 aGlsZSAoMSk7CiB9CiAKLXN0YXRpYyB2b2lkCi1zdGFja19wcm90ZWN0b3JfaW5pdCAodm9pZCkK K2dydWJfYWRkcl90CitncnViX3N0YWNrX3Byb3RlY3Rvcl9pbml0ICh2b2lkKQogewogICBncnVi X2VmaV9ybmdfcHJvdG9jb2xfdCAqcm5nOwogCkBAIC04NywyMyArODEsMjAgQEAgc3RhY2tfcHJv dGVjdG9yX2luaXQgKHZvaWQpCiAgIGlmIChybmcgIT0gTlVMTCkKICAgICB7CiAgICAgICBncnVi X2VmaV9zdGF0dXNfdCBzdGF0dXM7CisgICAgICBncnViX2FkZHJfdCBndWFyZCA9IDA7CiAKLSAg ICAgIHN0YXR1cyA9IHJuZy0+Z2V0X3JuZyAocm5nLCBOVUxMLCBzaXplb2YgKHN0YWNrX2Noa19n dWFyZF9idWYpLAotCQkJICAgICBzdGFja19jaGtfZ3VhcmRfYnVmKTsKKyAgICAgIHN0YXR1cyA9 IHJuZy0+Z2V0X3JuZyAocm5nLCBOVUxMLCBzaXplb2YgKGd1YXJkKSAtIDEsCisJCSAgICAgICAg ICAgICAoZ3J1Yl9lZmlfdWludDhfdCAqKSAmZ3VhcmQpOwogICAgICAgaWYgKHN0YXR1cyA9PSBH UlVCX0VGSV9TVUNDRVNTKQotCWdydWJfbWVtY3B5ICgmX19zdGFja19jaGtfZ3VhcmQsIHN0YWNr X2Noa19ndWFyZF9idWYsIHNpemVvZiAoX19zdGFja19jaGtfZ3VhcmQpKTsKKwlyZXR1cm4gZ3Vh cmQ7CiAgICAgfQotfQotI2Vsc2UKLXN0YXRpYyB2b2lkCi1zdGFja19wcm90ZWN0b3JfaW5pdCAo dm9pZCkKLXsKKyAgcmV0dXJuIDA7CiB9CiAjZW5kaWYKIAogZ3J1Yl9hZGRyX3QgZ3J1Yl9tb2Ri YXNlOwogCi1fX2F0dHJpYnV0ZV9fICgoX19vcHRpbWl6ZV9fICgiLWZuby1zdGFjay1wcm90ZWN0 b3IiKSkpIHZvaWQKK3ZvaWQKIGdydWJfZWZpX2luaXQgKHZvaWQpCiB7CiAgIGdydWJfbW9kYmFz ZSA9IGdydWJfZWZpX3NlY3Rpb25fYWRkciAoIm1vZHMiKTsKQEAgLTExMSw4ICsxMDIsNiBAQCBn cnViX2VmaV9pbml0ICh2b2lkKQogICAgICBtZXNzYWdlcy4gICovCiAgIGdydWJfY29uc29sZV9p bml0ICgpOwogCi0gIHN0YWNrX3Byb3RlY3Rvcl9pbml0ICgpOwotCiAgIC8qIEluaXRpYWxpemUg dGhlIG1lbW9yeSBtYW5hZ2VtZW50IHN5c3RlbS4gICovCiAgIGdydWJfZWZpX21tX2luaXQgKCk7 CiAKZGlmZiAtLWdpdCBhL2dydWItY29yZS9rZXJuL21haW4uYyBiL2dydWItY29yZS9rZXJuL21h aW4uYwppbmRleCA3MzFjMDdjMjkuLjVkYjUwNGU2ZSAxMDA2NDQKLS0tIGEvZ3J1Yi1jb3JlL2tl cm4vbWFpbi5jCisrKyBiL2dydWItY29yZS9rZXJuL21haW4uYwpAQCAtMjY1LDYgKzI2NSwxMSBA QCByZWNsYWltX21vZHVsZV9zcGFjZSAodm9pZCkKIHZvaWQgX19hdHRyaWJ1dGVfXyAoKG5vcmV0 dXJuKSkKIGdydWJfbWFpbiAodm9pZCkKIHsKKyNpZmRlZiBHUlVCX1NUQUNLX1BST1RFQ1RPUgor ICAvKiBUaGlzIGNhbGwgY2FuIG9ubHkgYmUgbWFkZSBmcm9tIGEgZnVuY3Rpb24gdGhhdCBkb2Vz IG5vdCByZXR1cm4uICovCisgIGdydWJfdXBkYXRlX3N0YWNrX2d1YXJkICgpOworI2VuZGlmCisK ICAgLyogRmlyc3Qgb2YgYWxsLCBpbml0aWFsaXplIHRoZSBtYWNoaW5lLiAgKi8KICAgZ3J1Yl9t YWNoaW5lX2luaXQgKCk7CiAKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZ3J1Yi9zdGFja19wcm90ZWN0 b3IuaCBiL2luY2x1ZGUvZ3J1Yi9zdGFja19wcm90ZWN0b3IuaAppbmRleCBjODhkYzAwYjUuLjky MTJiYjRhNiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9ncnViL3N0YWNrX3Byb3RlY3Rvci5oCisrKyBi L2luY2x1ZGUvZ3J1Yi9zdGFja19wcm90ZWN0b3IuaApAQCAtMjUsNiArMjUsMTkgQEAKICNpZmRl ZiBHUlVCX1NUQUNLX1BST1RFQ1RPUgogZXh0ZXJuIGdydWJfYWRkcl90IEVYUE9SVF9WQVIgKF9f c3RhY2tfY2hrX2d1YXJkKTsKIGV4dGVybiB2b2lkIF9fYXR0cmlidXRlX18gKChub3JldHVybikp IEVYUE9SVF9GVU5DIChfX3N0YWNrX2Noa19mYWlsKSAodm9pZCk7CisKK2dydWJfYWRkcl90Citn cnViX3N0YWNrX3Byb3RlY3Rvcl9pbml0ICh2b2lkKTsKKworc3RhdGljIGlubGluZSBfX2F0dHJp YnV0ZV9fKChfX2Fsd2F5c19pbmxpbmVfXykpCit2b2lkIGdydWJfdXBkYXRlX3N0YWNrX2d1YXJk ICh2b2lkKQoreworICBncnViX2FkZHJfdCBndWFyZDsKKworICBndWFyZCA9IGdydWJfc3RhY2tf cHJvdGVjdG9yX2luaXQgKCk7CisgIGlmIChndWFyZCkKKyAgICAgX19zdGFja19jaGtfZ3VhcmQg PSBndWFyZDsKK30KICNlbmRpZgogCiAjZW5kaWYgLyogR1JVQl9TVEFDS19QUk9URUNUT1JfSCAq LwotLSAKMi40My4wLjI3NS5nMzQ2MGUzZDY2Ny1nb29nCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KR3J1Yi1kZXZlbCBtYWlsaW5nIGxpc3QKR3J1Yi1k ZXZlbEBnbnUub3JnCmh0dHBzOi8vbGlzdHMuZ251Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2dydWIt ZGV2ZWwK