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 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 658A7C47072 for ; Sat, 23 Dec 2023 13:38:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rH2CL-0007De-F3; Sat, 23 Dec 2023 08:37:49 -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 <3YsiGZQgKCkEduge+jlwjrrjoh.frpjuxe-ghyhojqx.ruj@flex--ardb.bounces.google.com>) id 1rH0Rr-0004Z5-V8 for grub-devel@gnu.org; Sat, 23 Dec 2023 06:45:48 -0500 Received: from mail-wm1-x34a.google.com ([2a00:1450:4864:20::34a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3YsiGZQgKCkEduge+jlwjrrjoh.frpjuxe-ghyhojqx.ruj@flex--ardb.bounces.google.com>) id 1rH0Rp-0007Qs-4I for grub-devel@gnu.org; Sat, 23 Dec 2023 06:45:43 -0500 Received: by mail-wm1-x34a.google.com with SMTP id 5b1f17b1804b1-40d4853b04eso11186205e9.0 for ; Sat, 23 Dec 2023 03:45:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1703331938; x=1703936738; darn=gnu.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=PiY6xjeeFKfjACuGpDAMo+gZIuuyjckMNmUrU82soDk=; b=0Ny/qpgwJlp5OwSg1tOzGhBmImkgwr2ei6dvq2vlvjIXuGtGISWmzABY+yW/I1B2tZ 8xiS1Z4BkJpXykL/APKIcNMIITpc66WGiDsTuIANeyMRZjaAjcNJkFgpipmHZDIQarX7 TfUcKAefQNIJNKN+fE2T6LO0efcKtAjiL/2iuDzehWBigk/wOPDZbVgF0++lOFV48eHT rGeAmFaDwEt97nKavXPLgX8qfYC6/DBAdyU+iQZ3Z20dZsZ5yU9cKDqL6qOgOTweAvUs EHCasi2ivH5OJuwwDl5rZ7QbrBJscMgk2eOTIJjKn22NrEI97i/RZ+R6bxBvUKj0GnQK WWpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703331938; x=1703936738; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=PiY6xjeeFKfjACuGpDAMo+gZIuuyjckMNmUrU82soDk=; b=bIFA74zjM4D4913PkCfcqwgORURSapBh7IJicdxMdG1E4Kucvx9+9bX9Dp5wbDdeRy 7HDybTmVOe1ye6uC0sFPMX9XTnps9rvbdIjcbnoXfaA7o/V25vWPteMHVahUFX+Ecu+N pSK0tWC65j/aTZv+5VpuDOnZjViLocVvyIYrzBARGA3lijX3Fubm5JSFNGGe77s6PZ/S npGVVN786V+Di//m/EGwm54N5RA6ZWB2XT6BfVNwZn4nlgaZSdlw84GyHq5ISviKbmyZ mpSyx1HxcEFxItx2gWPSVDhmv3VekvznFvyBhS26+NDH3xBuUZEaHGfi6TZD1i3sCXud O3AQ== X-Gm-Message-State: AOJu0Yy4uG34/AdZYodby87BxUsS7OTpSq9LmkxrbwTHR/NVaMsOCdiB pQ25EFiCkeqqx7kzyelJmbjibpOwm9evzwMQ4QYay7luyrILqmlXHBBExsBFMlVWTI4E2G3zeRr ZPgUs0R3BTYK1/WxUfwlS3bLu7YI9W9Qauvuj0XCfWzc2UZBgo8LSdCT2VA== X-Google-Smtp-Source: AGHT+IEPl/bYhTNgrhGkOQpGGHPfwfUdM/ZJA1S8c0LIhgRTiHupMMpCU/xDApBm+BTrxyLPKSt8m36J X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:600c:511d:b0:40b:415e:e157 with SMTP id o29-20020a05600c511d00b0040b415ee157mr146953wms.2.1703331938294; Sat, 23 Dec 2023 03:45:38 -0800 (PST) Date: Sat, 23 Dec 2023 12:45:35 +0100 Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20231223114535.3866561-1-ardb+git@google.com> Subject: [PATCH] efi: Fix stack protector issues To: grub-devel@gnu.org Received-SPF: pass client-ip=2a00:1450:4864:20::34a; envelope-from=3YsiGZQgKCkEduge+jlwjrrjoh.frpjuxe-ghyhojqx.ruj@flex--ardb.bounces.google.com; helo=mail-wm1-x34a.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-Mailman-Approved-At: Sat, 23 Dec 2023 08:37:47 -0500 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 , dkiper@net-space.pl, Ard Biesheuvel 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 b3QgbXVzdCBub3QgaW52b2x2ZSBhbnkgaW5zdHJ1bWVudGVkIGZ1bmN0aW9uIGNhbGxzLgoKU28g YXZvaWQgYW55IGZ1bmN0aW9uIGNhbGxzLCBpbmNsdWRpbmcgZ3J1Yl9tZW1jcHkoKSwgd2hpY2gg aXMKdW5uZWNlc3NhcnkgZ2l2ZW4gdGhhdCB0aGUgc3RhY2sgY29va2llIGlzIGFsd2F5cyBhIHN1 aXRhYmx5IGFsaWduZWQKdmFyaWFibGUgb2YgdGhlIG5hdGl2ZSB3b3JkIHNpemUuCgpXaGlsZSBh dCBpdCwgbGVhdmUgdGhlIGxhc3QgYnl0ZSAweDAgdG8gYXZvaWQgaW5hZHZlcnRlbnQgdW5ib3Vu ZGVkCnN0cmluZ3Mgb24gdGhlIHN0YWNrLgoKTm90ZSB0aGF0IHRoZSB1c2Ugb2YgX19hdHRyaWJ1 dGVfXygob3B0aW1pemUpKSBpcyBkZXNjcmliZWQgYXMKdW5zdWl0YWJsZSBmb3IgcHJvZHVjdGlv biB1c2UgaW4gdGhlIEdDQyBkb2N1bWVudGF0aW9uLCBzbyBsZXQncyBkcm9wCnRoaXMgYXMgd2Vs bCBub3cgdGhhdCBpdCBpcyBubyBsb25nZXIgbmVlZGVkLgoKU2lnbmVkLW9mZi1ieTogQXJkIEJp ZXNoZXV2ZWwgPGFyZGJAa2VybmVsLm9yZz4KLS0tCiBncnViLWNvcmUva2Vybi9lZmkvaW5pdC5j ICAgICAgfCAyNyArKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIGdydWItY29yZS9rZXJuL21h aW4uYyAgICAgICAgICB8ICA1ICsrKysrCiBpbmNsdWRlL2dydWIvc3RhY2tfcHJvdGVjdG9yLmgg fCAxMyArKysrKysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDE5 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dydWItY29yZS9rZXJuL2VmaS9pbml0LmMgYi9n cnViLWNvcmUva2Vybi9lZmkvaW5pdC5jCmluZGV4IDZjNTRhZjZlNy4uMTYzNzA3N2UxIDEwMDY0 NAotLS0gYS9ncnViLWNvcmUva2Vybi9lZmkvaW5pdC5jCisrKyBiL2dydWItY29yZS9rZXJuL2Vm aS9pbml0LmMKQEAgLTM5LDEyICszOSw2IEBAIHN0YXRpYyBncnViX2VmaV9jaGFyMTZfdCBzdGFj a19jaGtfZmFpbF9tc2dbXSA9CiAKIHN0YXRpYyBncnViX2d1aWRfdCBybmdfcHJvdG9jb2xfZ3Vp ZCA9IEdSVUJfRUZJX1JOR19QUk9UT0NPTF9HVUlEOwogCi0vKgotICogRG9uJ3QgcHV0IHRoaXMg b24gZ3J1Yl9lZmlfaW5pdCgpJ3MgbG9jYWwgc3RhY2sgdG8gYXZvaWQgaXQKLSAqIGdldHRpbmcg YSBzdGFjayBjaGVjay4KLSAqLwotc3RhdGljIGdydWJfZWZpX3VpbnQ4X3Qgc3RhY2tfY2hrX2d1 YXJkX2J1ZlszMl07Ci0KIC8qIEluaXRpYWxpemUgY2FuYXJ5IGluIGNhc2UgdGhlcmUgaXMgbm8g Uk5HIHByb3RvY29sLiAqLwogZ3J1Yl9hZGRyX3QgX19zdGFja19jaGtfZ3VhcmQgPSAoZ3J1Yl9h ZGRyX3QpIEdSVUJfU1RBQ0tfUFJPVEVDVE9SX0lOSVQ7CiAKQEAgLTc3LDggKzcxLDggQEAgX19z dGFja19jaGtfZmFpbCAodm9pZCkKICAgd2hpbGUgKDEpOwogfQogCi1zdGF0aWMgdm9pZAotc3Rh Y2tfcHJvdGVjdG9yX2luaXQgKHZvaWQpCitncnViX2FkZHJfdAorZ3J1Yl9zdGFja19wcm90ZWN0 b3JfaW5pdCAodm9pZCkKIHsKICAgZ3J1Yl9lZmlfcm5nX3Byb3RvY29sX3QgKnJuZzsKIApAQCAt ODcsMjMgKzgxLDIwIEBAIHN0YWNrX3Byb3RlY3Rvcl9pbml0ICh2b2lkKQogICBpZiAocm5nICE9 IE5VTEwpCiAgICAgewogICAgICAgZ3J1Yl9lZmlfc3RhdHVzX3Qgc3RhdHVzOworICAgICAgZ3J1 Yl9hZGRyX3QgZ3VhcmQgPSAwOwogCi0gICAgICBzdGF0dXMgPSBybmctPmdldF9ybmcgKHJuZywg TlVMTCwgc2l6ZW9mIChzdGFja19jaGtfZ3VhcmRfYnVmKSwKLQkJCSAgICAgc3RhY2tfY2hrX2d1 YXJkX2J1Zik7CisgICAgICBzdGF0dXMgPSBybmctPmdldF9ybmcgKHJuZywgTlVMTCwgc2l6ZW9m IChndWFyZCkgLSAxLAorCQkgICAgICAgICAgICAgKGdydWJfZWZpX3VpbnQ4X3QgKikgJmd1YXJk KTsKICAgICAgIGlmIChzdGF0dXMgPT0gR1JVQl9FRklfU1VDQ0VTUykKLQlncnViX21lbWNweSAo Jl9fc3RhY2tfY2hrX2d1YXJkLCBzdGFja19jaGtfZ3VhcmRfYnVmLCBzaXplb2YgKF9fc3RhY2tf Y2hrX2d1YXJkKSk7CisJcmV0dXJuIGd1YXJkOwogICAgIH0KLX0KLSNlbHNlCi1zdGF0aWMgdm9p ZAotc3RhY2tfcHJvdGVjdG9yX2luaXQgKHZvaWQpCi17CisgIHJldHVybiAwOwogfQogI2VuZGlm CiAKIGdydWJfYWRkcl90IGdydWJfbW9kYmFzZTsKIAotX19hdHRyaWJ1dGVfXyAoKF9fb3B0aW1p emVfXyAoIi1mbm8tc3RhY2stcHJvdGVjdG9yIikpKSB2b2lkCit2b2lkCiBncnViX2VmaV9pbml0 ICh2b2lkKQogewogICBncnViX21vZGJhc2UgPSBncnViX2VmaV9zZWN0aW9uX2FkZHIgKCJtb2Rz Iik7CkBAIC0xMTEsOCArMTAyLDYgQEAgZ3J1Yl9lZmlfaW5pdCAodm9pZCkKICAgICAgbWVzc2Fn ZXMuICAqLwogICBncnViX2NvbnNvbGVfaW5pdCAoKTsKIAotICBzdGFja19wcm90ZWN0b3JfaW5p dCAoKTsKLQogICAvKiBJbml0aWFsaXplIHRoZSBtZW1vcnkgbWFuYWdlbWVudCBzeXN0ZW0uICAq LwogICBncnViX2VmaV9tbV9pbml0ICgpOwogCmRpZmYgLS1naXQgYS9ncnViLWNvcmUva2Vybi9t YWluLmMgYi9ncnViLWNvcmUva2Vybi9tYWluLmMKaW5kZXggNzMxYzA3YzI5Li4xMjQ0ZmE4NGYg MTAwNjQ0Ci0tLSBhL2dydWItY29yZS9rZXJuL21haW4uYworKysgYi9ncnViLWNvcmUva2Vybi9t YWluLmMKQEAgLTI3MCw2ICsyNzAsMTEgQEAgZ3J1Yl9tYWluICh2b2lkKQogCiAgIGdydWJfYm9v dF90aW1lICgiQWZ0ZXIgbWFjaGluZSBpbml0LiIpOwogCisjaWZkZWYgR1JVQl9TVEFDS19QUk9U RUNUT1IKKyAgLyogVGhpcyBjYWxsIGNhbiBvbmx5IGJlIG1hZGUgZnJvbSBhIGZ1bmN0aW9uIHRo YXQgZG9lcyBub3QgcmV0dXJuLiAqLworICBncnViX3VwZGF0ZV9zdGFja19ndWFyZCAoKTsKKyNl bmRpZgorCiAgIC8qIFRoaXMgYnJlYWtzIGZsaWNrZXItZnJlZSBib290IG9uIEVGSSBzeXN0ZW1z LCBzbyBkaXNhYmxlIGl0IHRoZXJlLiAqLwogI2lmbmRlZiBHUlVCX01BQ0hJTkVfRUZJCiAgIC8q IEhlbGxvLiAgKi8KZGlmZiAtLWdpdCBhL2luY2x1ZGUvZ3J1Yi9zdGFja19wcm90ZWN0b3IuaCBi L2luY2x1ZGUvZ3J1Yi9zdGFja19wcm90ZWN0b3IuaAppbmRleCBjODhkYzAwYjUuLjkyMTJiYjRh NiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9ncnViL3N0YWNrX3Byb3RlY3Rvci5oCisrKyBiL2luY2x1 ZGUvZ3J1Yi9zdGFja19wcm90ZWN0b3IuaApAQCAtMjUsNiArMjUsMTkgQEAKICNpZmRlZiBHUlVC X1NUQUNLX1BST1RFQ1RPUgogZXh0ZXJuIGdydWJfYWRkcl90IEVYUE9SVF9WQVIgKF9fc3RhY2tf Y2hrX2d1YXJkKTsKIGV4dGVybiB2b2lkIF9fYXR0cmlidXRlX18gKChub3JldHVybikpIEVYUE9S VF9GVU5DIChfX3N0YWNrX2Noa19mYWlsKSAodm9pZCk7CisKK2dydWJfYWRkcl90CitncnViX3N0 YWNrX3Byb3RlY3Rvcl9pbml0ICh2b2lkKTsKKworc3RhdGljIGlubGluZSBfX2F0dHJpYnV0ZV9f KChfX2Fsd2F5c19pbmxpbmVfXykpCit2b2lkIGdydWJfdXBkYXRlX3N0YWNrX2d1YXJkICh2b2lk KQoreworICBncnViX2FkZHJfdCBndWFyZDsKKworICBndWFyZCA9IGdydWJfc3RhY2tfcHJvdGVj dG9yX2luaXQgKCk7CisgIGlmIChndWFyZCkKKyAgICAgX19zdGFja19jaGtfZ3VhcmQgPSBndWFy ZDsKK30KICNlbmRpZgogCiAjZW5kaWYgLyogR1JVQl9TVEFDS19QUk9URUNUT1JfSCAqLwotLSAK Mi40My4wLjQ3Mi5nMzE1NTk0NmMzYS1nb29nCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KR3J1Yi1kZXZlbCBtYWlsaW5nIGxpc3QKR3J1Yi1kZXZlbEBn bnUub3JnCmh0dHBzOi8vbGlzdHMuZ251Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2dydWItZGV2ZWwK