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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 44B33EEB57A for ; Sat, 9 Sep 2023 00:38:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rWXVDAduEEyCo6o5FtDwfxCeA8JgHBm6Tp0GO7p2XAw=; b=y7D+527wJTFyu+ H4M461zYxHdW93OvjJ0Gf5Kx1i7rVdIf/byYhik6kk3lZZQgVrVECpBpVoiUtjHoud9WXpjSfBr0O 4TBf1edC87wjjKybj34rcOxBVIh1ftMZViKVRXMCW8VPSuX59+lbnC74QLa1mSF5akvrLy83LkLPc 6kbhMQuimmR+s+ihb6M1y9zKZ5R/fg2su0y2lVSajAA08cXfK7adVzl1qBoHOi5/gzVcv2z7I+5aF U9Ji0rbFsaAANqz14BO9PesUJ5kLbWSN7eiNjTuqWoNiPeuVo0CSYFw4WJ8UjG/73Cl4eZ5IhRQmX 2jRkYMy0+oXMqkhwStdg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qelzP-00Emju-28; Sat, 09 Sep 2023 00:38:19 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qelzM-00EmiV-1T for linux-riscv@lists.infradead.org; Sat, 09 Sep 2023 00:38:18 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E3506615D1; Sat, 9 Sep 2023 00:38:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0ACACC433CB; Sat, 9 Sep 2023 00:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694219895; bh=c7A2T2kDMKnljYsyhWTIiqMgRghvPMAiuvkhE7iublY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rb9mC/2+CsKfkIAzADNB1R4kkTNwDxmKWzqS29+2qRxKEARPWcAUzTsnWvAkhHZCP x3BZn0NJGr0Ice9uUDSdrgP4dYCfh49LmWdqiU3RibccrCuGqGttPJAoU4Xaue0mN+ JRftnN2wZrZeozNf5A9AoQJIXHZJ8TywxGTcb0OCeMcqA7Xjs7UUPJDOVr7guJKUKd /cCiDy81+CGCPHO2NICaasGhkoDwcxpRr0V+wkLYnK8swOnl+CHcPJwOVANsCGvd+T YtkzAIsTAFjDKEYgMzEY/mpsXwNyGtLuPKTQBGTFRSo4fsrwbxcCrbbLS1uxSgBJpB BWGkxzp97dORQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sami Tolvanen , Kees Cook , Conor Dooley , Nathan Chancellor , Palmer Dabbelt , Sasha Levin , paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, ndesaulniers@google.com, peterz@infradead.org, ajones@ventanamicro.com, heiko@sntech.de, prabhakar.mahadev-lad.rj@bp.renesas.com, liaochang1@huawei.com, namcaov@gmail.com, andy.chiu@sifive.com, guoren@kernel.org, alexghiti@rivosinc.com, bjorn@rivosinc.com, jeeheng.sia@starfivetech.com, jszhang@kernel.org, greentime.hu@sifive.com, masahiroy@kernel.org, apatel@ventanamicro.com, mnissler@rivosinc.com, coelacanthushex@gmail.com, linux-riscv@lists.infradead.org, llvm@lists.linux.dev Subject: [PATCH AUTOSEL 6.4 25/25] riscv: Add CFI error handling Date: Fri, 8 Sep 2023 20:37:13 -0400 Message-Id: <20230909003715.3579761-25-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230909003715.3579761-1-sashal@kernel.org> References: <20230909003715.3579761-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.15 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230908_173816_576026_90E63452 X-CRM114-Status: GOOD ( 24.69 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org RnJvbTogU2FtaSBUb2x2YW5lbiA8c2FtaXRvbHZhbmVuQGdvb2dsZS5jb20+CgpbIFVwc3RyZWFt IGNvbW1pdCBhZjBlYWQ0MmY2OTM4OWNkNGVkNjhlMWE0YzZjZGU0NWMwYWRiMzVjIF0KCldpdGgg Q09ORklHX0NGSV9DTEFORywgdGhlIGNvbXBpbGVyIGluamVjdHMgYSB0eXBlIHByZWFtYmxlIGlt bWVkaWF0ZWx5CmJlZm9yZSBlYWNoIGZ1bmN0aW9uIGFuZCBhIGNoZWNrIHRvIHZhbGlkYXRlIHRo ZSB0YXJnZXQgZnVuY3Rpb24gdHlwZQpiZWZvcmUgaW5kaXJlY3QgY2FsbHM6CgogIDsgdHlwZSBw cmVhbWJsZQogICAgLndvcmQgPGlkPgogIGZ1bmN0aW9uOgogICAgLi4uCiAgOyBpbmRpcmVjdCBj YWxsIGNoZWNrCiAgICBsdyAgICAgIHQxLCAtNChhMCkKICAgIGx1aSAgICAgdDIsIDxoaTIwPgog ICAgYWRkaXcgICB0MiwgdDIsIDxsbzEyPgogICAgYmVxICAgICB0MSwgdDIsIC5MdG1wMAogICAg ZWJyZWFrCiAgLkx0bXAwOgogICAgamFybCAgICBhMAoKSW1wbGVtZW50IGVycm9yIGhhbmRsaW5n IGNvZGUgZm9yIHRoZSBlYnJlYWsgdHJhcHMgZW1pdHRlZCBmb3IgdGhlCmNoZWNrcy4gVGhpcyBw cm9kdWNlcyB0aGUgZm9sbG93aW5nIG9vcHMgb24gYSBDRkkgZmFpbHVyZSAoZ2VuZXJhdGVkCnVz aW5nIGxrZHRtKToKClsgICAyMS4xNzcyNDVdIENGSSBmYWlsdXJlIGF0IGxrZHRtX2luZGlyZWN0 X2NhbGwrMHgyMi8weDMyIFtsa2R0bV0KKHRhcmdldDogbGtkdG1faW5jcmVtZW50X2ludCsweDAv MHgxOCBbbGtkdG1dOyBleHBlY3RlZCB0eXBlOiAweDNhZDU1YWNhKQpbICAgMjEuMTc4NDgzXSBL ZXJuZWwgQlVHIFsjMV0KWyAgIDIxLjE3ODY3MV0gTW9kdWxlcyBsaW5rZWQgaW46IGxrZHRtClsg ICAyMS4xNzkwMzddIENQVTogMSBQSUQ6IDEwNCBDb21tOiBzaCBOb3QgdGFpbnRlZAo2LjMuMC1y YzYtMDAwMzctZzM3ZDVlYzYyOTdhYiAjMQpbICAgMjEuMTc5NTExXSBIYXJkd2FyZSBuYW1lOiBy aXNjdi12aXJ0aW8scWVtdSAoRFQpClsgICAyMS4xNzk4MThdIGVwYyA6IGxrZHRtX2luZGlyZWN0 X2NhbGwrMHgyMi8weDMyIFtsa2R0bV0KWyAgIDIxLjE4MDEwNl0gIHJhIDogbGtkdG1fQ0ZJX0ZP UldBUkRfUFJPVE8rMHg0OC8weDdjIFtsa2R0bV0KWyAgIDIxLjE4MDQyNl0gZXBjIDogZmZmZmZm ZmYwMTM4NzA5MiByYSA6IGZmZmZmZmZmMDEzODZmMTQgc3AgOiBmZjIwMDAwMDAwNDUzY2YwClsg ICAyMS4xODA3OTJdICBncCA6IGZmZmZmZmZmODEzMDhjMzggdHAgOiBmZjYwMDAwMDAyNDNmMDgw IHQwIDogZmYyMDAwMDAwMDQ1M2I3OApbICAgMjEuMTgxMTU3XSAgdDEgOiAwMDAwMDAwMDNhZDU1 YWNhIHQyIDogMDAwMDAwMDA3ZTBjNTJhNSBzMCA6IGZmMjAwMDAwMDA0NTNkMDAKWyAgIDIxLjE4 MTUwNl0gIHMxIDogMDAwMDAwMDAwMDAwMDAwMSBhMCA6IGZmZmZmZmZmMDEzOGQxNzAgYTEgOiBm ZmZmZmZmZjAxMzg3MGJjClsgICAyMS4xODE4MTldICBhMiA6IGI1ZmVhNDhkZDg5YWE3MDAgYTMg OiAwMDAwMDAwMDAwMDAwMDAxIGE0IDogMDAwMDAwMDAwMDAwMGZmZgpbICAgMjEuMTgyMTY5XSAg YTUgOiAwMDAwMDAwMDAwMDAwMDA0IGE2IDogMDAwMDAwMDAwMDAwMDBiNyBhNyA6IDAwMDAwMDAw MDAwMDAwMDAKWyAgIDIxLjE4MjU5MV0gIHMyIDogZmYyMDAwMDAwMDQ1M2U3OCBzMyA6IGZmZmZm ZmZmZmZmZmZmZWEgczQgOiAwMDAwMDAwMDAwMDAwMDEyClsgICAyMS4xODMwMDFdICBzNSA6IGZm NjAwMDAwMDIzYzcwMDAgczYgOiAwMDAwMDAwMDAwMDAwMDA2IHM3IDogZmZmZmZmZmYwMTM4ODJh MApbICAgMjEuMTgzNjUzXSAgczggOiAwMDAwMDAwMDAwMDAwMDA4IHM5IDogMDAwMDAwMDAwMDAw MDAwMiBzMTA6IGZmZmZmZmZmMDEzOGQ4NzgKWyAgIDIxLjE4NDI0NV0gIHMxMTogZmZmZmZmZmYw MTM4ZDg3OCB0MyA6IDAwMDAwMDAwMDAwMDAwMDMgdDQgOiAwMDAwMDAwMDAwMDAwMDAwClsgICAy MS4xODQ1OTFdICB0NSA6IGZmZmZmZmZmODEzM2RmMDggdDYgOiBmZmZmZmZmZjgxMzNkZjA3Clsg ICAyMS4xODQ4NThdIHN0YXR1czogMDAwMDAwMDAwMDAwMDEyMCBiYWRhZGRyOiAwMDAwMDAwMDAw MDAwMDAwCmNhdXNlOiAwMDAwMDAwMDAwMDAwMDAzClsgICAyMS4xODU0MTVdIFs8ZmZmZmZmZmYw MTM4NzA5Mj5dIGxrZHRtX2luZGlyZWN0X2NhbGwrMHgyMi8weDMyIFtsa2R0bV0KWyAgIDIxLjE4 NTc3Ml0gWzxmZmZmZmZmZjAxMzg2ZjE0Pl0gbGtkdG1fQ0ZJX0ZPUldBUkRfUFJPVE8rMHg0OC8w eDdjIFtsa2R0bV0KWyAgIDIxLjE4NjA5M10gWzxmZmZmZmZmZjAxMzgzNTUyPl0gbGtkdG1fZG9f YWN0aW9uKzB4MjIvMHgzNCBbbGtkdG1dClsgICAyMS4xODY0NDVdIFs8ZmZmZmZmZmYwMTM4MzUw Yz5dIGRpcmVjdF9lbnRyeSsweDEyOC8weDEzYSBbbGtkdG1dClsgICAyMS4xODY4MTddIFs8ZmZm ZmZmZmY4MDMzZWQ4Yz5dIGZ1bGxfcHJveHlfd3JpdGUrMHg1OC8weGIyClsgICAyMS4xODczNTJd IFs8ZmZmZmZmZmY4MDFkNGZlOD5dIHZmc193cml0ZSsweDE0Yy8weDMzYQpbICAgMjEuMTg3NjQ0 XSBbPGZmZmZmZmZmODAxZDUzMjg+XSBrc3lzX3dyaXRlKzB4NjQvMHhkNApbICAgMjEuMTg3ODMy XSBbPGZmZmZmZmZmODAxZDUzYTY+XSBzeXNfd3JpdGUrMHhlLzB4MWEKWyAgIDIxLjE4ODE3MV0g WzxmZmZmZmZmZjgwMDAzOTk2Pl0gcmV0X2Zyb21fc3lzY2FsbCsweDAvMHgyClsgICAyMS4xODg1 OTVdIENvZGU6IDA1MTMgMGY2NSBhMzAzIGZmYzUgNTNiNyA3ZTBjIDgzOWIgMmE1MyAwMzYzIDAw NzMgKDkwMDIpIDk1ODIKWyAgIDIxLjE4OTE3OF0gLS0tWyBlbmQgdHJhY2UgMDAwMDAwMDAwMDAw MDAwMCBdLS0tClsgICAyMS4xODk1OTBdIEtlcm5lbCBwYW5pYyAtIG5vdCBzeW5jaW5nOiBGYXRh bCBleGNlcHRpb24KClJldmlld2VkLWJ5OiBLZWVzIENvb2sgPGtlZXNjb29rQGNocm9taXVtLm9y Zz4KUmV2aWV3ZWQtYnk6IENvbm9yIERvb2xleSA8Y29ub3IuZG9vbGV5QG1pY3JvY2hpcC5jb20+ ICMgSVNBIGJpdHMKVGVzdGVkLWJ5OiBOYXRoYW4gQ2hhbmNlbGxvciA8bmF0aGFuQGtlcm5lbC5v cmc+ClNpZ25lZC1vZmYtYnk6IFNhbWkgVG9sdmFuZW4gPHNhbWl0b2x2YW5lbkBnb29nbGUuY29t PgpMaW5rOiBodHRwczovL2xvcmUua2VybmVsLm9yZy9yLzIwMjMwNzEwMTgzNTQ0Ljk5OTU0MC0x Mi1zYW1pdG9sdmFuZW5AZ29vZ2xlLmNvbQpTaWduZWQtb2ZmLWJ5OiBQYWxtZXIgRGFiYmVsdCA8 cGFsbWVyQHJpdm9zaW5jLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBr ZXJuZWwub3JnPgotLS0KIGFyY2gvcmlzY3YvS2NvbmZpZyAgICAgICAgICAgIHwgIDEgKwogYXJj aC9yaXNjdi9pbmNsdWRlL2FzbS9jZmkuaCAgfCAyMiArKysrKysrKysrCiBhcmNoL3Jpc2N2L2lu Y2x1ZGUvYXNtL2luc24uaCB8IDEwICsrKysrCiBhcmNoL3Jpc2N2L2tlcm5lbC9NYWtlZmlsZSAg ICB8ICAyICsKIGFyY2gvcmlzY3Yva2VybmVsL2NmaS5jICAgICAgIHwgNzcgKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysKIGFyY2gvcmlzY3Yva2VybmVsL3RyYXBzLmMgICAgIHwg IDQgKy0KIDYgZmlsZXMgY2hhbmdlZCwgMTE1IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkK IGNyZWF0ZSBtb2RlIDEwMDY0NCBhcmNoL3Jpc2N2L2luY2x1ZGUvYXNtL2NmaS5oCiBjcmVhdGUg bW9kZSAxMDA2NDQgYXJjaC9yaXNjdi9rZXJuZWwvY2ZpLmMKCmRpZmYgLS1naXQgYS9hcmNoL3Jp c2N2L0tjb25maWcgYi9hcmNoL3Jpc2N2L0tjb25maWcKaW5kZXggMDUyODQ1Mzg0ZWQzOC4uMzZk ZDAzOTBiODI1NyAxMDA2NDQKLS0tIGEvYXJjaC9yaXNjdi9LY29uZmlnCisrKyBiL2FyY2gvcmlz Y3YvS2NvbmZpZwpAQCAtNDUsNiArNDUsNyBAQCBjb25maWcgUklTQ1YKIAlzZWxlY3QgQVJDSF9T VVBQT1JUU19QQUdFX1RBQkxFX0NIRUNLIGlmIE1NVQogCXNlbGVjdCBBUkNIX1VTRV9NRU1URVNU CiAJc2VsZWN0IEFSQ0hfVVNFX1FVRVVFRF9SV0xPQ0tTCisJc2VsZWN0IEFSQ0hfVVNFU19DRklf VFJBUFMgaWYgQ0ZJX0NMQU5HCiAJc2VsZWN0IEFSQ0hfV0FOVF9ERUZBVUxUX1RPUERPV05fTU1B UF9MQVlPVVQgaWYgTU1VCiAJc2VsZWN0IEFSQ0hfV0FOVF9GUkFNRV9QT0lOVEVSUwogCXNlbGVj dCBBUkNIX1dBTlRfR0VORVJBTF9IVUdFVExCIGlmICFSSVNDVl9JU0FfU1ZOQVBPVApkaWZmIC0t Z2l0IGEvYXJjaC9yaXNjdi9pbmNsdWRlL2FzbS9jZmkuaCBiL2FyY2gvcmlzY3YvaW5jbHVkZS9h c20vY2ZpLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMC4uNTZiZjlk NjlkNWUzOAotLS0gL2Rldi9udWxsCisrKyBiL2FyY2gvcmlzY3YvaW5jbHVkZS9hc20vY2ZpLmgK QEAgLTAsMCArMSwyMiBAQAorLyogU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEdQTC0yLjAgKi8K KyNpZm5kZWYgX0FTTV9SSVNDVl9DRklfSAorI2RlZmluZSBfQVNNX1JJU0NWX0NGSV9ICisKKy8q CisgKiBDbGFuZyBDb250cm9sIEZsb3cgSW50ZWdyaXR5IChDRkkpIHN1cHBvcnQuCisgKgorICog Q29weXJpZ2h0IChDKSAyMDIzIEdvb2dsZSBMTEMKKyAqLworCisjaW5jbHVkZSA8bGludXgvY2Zp Lmg+CisKKyNpZmRlZiBDT05GSUdfQ0ZJX0NMQU5HCitlbnVtIGJ1Z190cmFwX3R5cGUgaGFuZGxl X2NmaV9mYWlsdXJlKHN0cnVjdCBwdF9yZWdzICpyZWdzKTsKKyNlbHNlCitzdGF0aWMgaW5saW5l IGVudW0gYnVnX3RyYXBfdHlwZSBoYW5kbGVfY2ZpX2ZhaWx1cmUoc3RydWN0IHB0X3JlZ3MgKnJl Z3MpCit7CisJcmV0dXJuIEJVR19UUkFQX1RZUEVfTk9ORTsKK30KKyNlbmRpZiAvKiBDT05GSUdf Q0ZJX0NMQU5HICovCisKKyNlbmRpZiAvKiBfQVNNX1JJU0NWX0NGSV9IICovCmRpZmYgLS1naXQg YS9hcmNoL3Jpc2N2L2luY2x1ZGUvYXNtL2luc24uaCBiL2FyY2gvcmlzY3YvaW5jbHVkZS9hc20v aW5zbi5oCmluZGV4IDYwMzA5NWM5MTNlMzcuLmJiZDg3OGQ0ODE1Y2UgMTAwNjQ0Ci0tLSBhL2Fy Y2gvcmlzY3YvaW5jbHVkZS9hc20vaW5zbi5oCisrKyBiL2FyY2gvcmlzY3YvaW5jbHVkZS9hc20v aW5zbi5oCkBAIC02Myw2ICs2Myw3IEBACiAjZGVmaW5lIFJWR19SUzFfT1BPRkYJCTE1CiAjZGVm aW5lIFJWR19SUzJfT1BPRkYJCTIwCiAjZGVmaW5lIFJWR19SRF9PUE9GRgkJNworI2RlZmluZSBS VkdfUlMxX01BU0sJCUdFTk1BU0soNCwgMCkKICNkZWZpbmUgUlZHX1JEX01BU0sJCUdFTk1BU0so NCwgMCkKIAogLyogVGhlIGJpdCBmaWVsZCBvZiBpbW1lZGlhdGUgdmFsdWUgaW4gUlZDIEogaW5z dHJ1Y3Rpb24gKi8KQEAgLTEzMCw2ICsxMzEsNyBAQAogI2RlZmluZSBSVkNfQzJfUlMxX09QT0ZG CTcKICNkZWZpbmUgUlZDX0MyX1JTMl9PUE9GRgkyCiAjZGVmaW5lIFJWQ19DMl9SRF9PUE9GRgkJ NworI2RlZmluZSBSVkNfQzJfUlMxX01BU0sJCUdFTk1BU0soNCwgMCkKIAogLyogcGFydHMgb2Yg b3Bjb2RlIGZvciBSVkcqLwogI2RlZmluZSBSVkdfT1BDT0RFX0ZFTkNFCTB4MGYKQEAgLTI2OSw2 ICsyNzEsMTAgQEAgc3RhdGljIF9fYWx3YXlzX2lubGluZSBib29sIHJpc2N2X2luc25faXNfY19q YWxyKHUzMiBjb2RlKQogI2RlZmluZSBSVl9YKFgsIHMsIG1hc2spICAoKChYKSA+PiAocykpICYg KG1hc2spKQogI2RlZmluZSBSVkNfWChYLCBzLCBtYXNrKSBSVl9YKFgsIHMsIG1hc2spCiAKKyNk ZWZpbmUgUlZfRVhUUkFDVF9SUzFfUkVHKHgpIFwKKwkoe3R5cGVvZih4KSB4XyA9ICh4KTsgXAor CShSVl9YKHhfLCBSVkdfUlMxX09QT0ZGLCBSVkdfUlMxX01BU0spKTsgfSkKKwogI2RlZmluZSBS Vl9FWFRSQUNUX1JEX1JFRyh4KSBcCiAJKHt0eXBlb2YoeCkgeF8gPSAoeCk7IFwKIAkoUlZfWCh4 XywgUlZHX1JEX09QT0ZGLCBSVkdfUkRfTUFTSykpOyB9KQpAQCAtMjk2LDYgKzMwMiwxMCBAQCBz dGF0aWMgX19hbHdheXNfaW5saW5lIGJvb2wgcmlzY3ZfaW5zbl9pc19jX2phbHIodTMyIGNvZGUp CiAJKFJWX1goeF8sIFJWX0JfSU1NXzExX09QT0ZGLCBSVl9CX0lNTV8xMV9NQVNLKSA8PCBSVl9C X0lNTV8xMV9PRkYpIHwgXAogCShSVl9JTU1fU0lHTih4XykgPDwgUlZfQl9JTU1fU0lHTl9PRkYp OyB9KQogCisjZGVmaW5lIFJWQ19FWFRSQUNUX0MyX1JTMV9SRUcoeCkgXAorCSh7dHlwZW9mKHgp IHhfID0gKHgpOyBcCisJKFJWX1goeF8sIFJWQ19DMl9SUzFfT1BPRkYsIFJWQ19DMl9SUzFfTUFT SykpOyB9KQorCiAjZGVmaW5lIFJWQ19FWFRSQUNUX0pUWVBFX0lNTSh4KSBcCiAJKHt0eXBlb2Yo eCkgeF8gPSAoeCk7IFwKIAkoUlZDX1goeF8sIFJWQ19KX0lNTV8zXzFfT1BPRkYsIFJWQ19KX0lN TV8zXzFfTUFTSykgPDwgUlZDX0pfSU1NXzNfMV9PRkYpIHwgXApkaWZmIC0tZ2l0IGEvYXJjaC9y aXNjdi9rZXJuZWwvTWFrZWZpbGUgYi9hcmNoL3Jpc2N2L2tlcm5lbC9NYWtlZmlsZQppbmRleCAx NTM4NjRlNGYzOTk2Li5jMTczYTdjYmY0ZTExIDEwMDY0NAotLS0gYS9hcmNoL3Jpc2N2L2tlcm5l bC9NYWtlZmlsZQorKysgYi9hcmNoL3Jpc2N2L2tlcm5lbC9NYWtlZmlsZQpAQCAtOTAsNiArOTAs OCBAQCBvYmotJChDT05GSUdfQ1JBU0hfQ09SRSkJKz0gY3Jhc2hfY29yZS5vCiAKIG9iai0kKENP TkZJR19KVU1QX0xBQkVMKQkrPSBqdW1wX2xhYmVsLm8KIAorb2JqLSQoQ09ORklHX0NGSV9DTEFO RykJCSs9IGNmaS5vCisKIG9iai0kKENPTkZJR19FRkkpCQkrPSBlZmkubwogb2JqLSQoQ09ORklH X0NPTVBBVCkJCSs9IGNvbXBhdF9zeXNjYWxsX3RhYmxlLm8KIG9iai0kKENPTkZJR19DT01QQVQp CQkrPSBjb21wYXRfc2lnbmFsLm8KZGlmZiAtLWdpdCBhL2FyY2gvcmlzY3Yva2VybmVsL2NmaS5j IGIvYXJjaC9yaXNjdi9rZXJuZWwvY2ZpLmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMC4uODIwMTU4ZDdhMjkxMwotLS0gL2Rldi9udWxsCisrKyBiL2FyY2gvcmlzY3Yv a2VybmVsL2NmaS5jCkBAIC0wLDAgKzEsNzcgQEAKKy8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVy OiBHUEwtMi4wCisvKgorICogQ2xhbmcgQ29udHJvbCBGbG93IEludGVncml0eSAoQ0ZJKSBzdXBw b3J0LgorICoKKyAqIENvcHlyaWdodCAoQykgMjAyMyBHb29nbGUgTExDCisgKi8KKyNpbmNsdWRl IDxhc20vY2ZpLmg+CisjaW5jbHVkZSA8YXNtL2luc24uaD4KKworLyoKKyAqIFJldHVybnMgdGhl IHRhcmdldCBhZGRyZXNzIGFuZCB0aGUgZXhwZWN0ZWQgdHlwZSB3aGVuIHJlZ3MtPmVwYyBwb2lu dHMKKyAqIHRvIGEgY29tcGlsZXItZ2VuZXJhdGVkIENGSSB0cmFwLgorICovCitzdGF0aWMgYm9v bCBkZWNvZGVfY2ZpX2luc24oc3RydWN0IHB0X3JlZ3MgKnJlZ3MsIHVuc2lnbmVkIGxvbmcgKnRh cmdldCwKKwkJCSAgICB1MzIgKnR5cGUpCit7CisJdW5zaWduZWQgbG9uZyAqcmVnc19wdHIgPSAo dW5zaWduZWQgbG9uZyAqKXJlZ3M7CisJaW50IHJzMV9udW07CisJdTMyIGluc247CisKKwkqdGFy Z2V0ID0gKnR5cGUgPSAwOworCisJLyoKKwkgKiBUaGUgY29tcGlsZXIgZ2VuZXJhdGVzIHRoZSBm b2xsb3dpbmcgaW5zdHJ1Y3Rpb24gc2VxdWVuY2UKKwkgKiBmb3IgaW5kaXJlY3QgY2FsbCBjaGVj a3M6CisJICoKKwkgKiDCoCBsdyAgICAgIHQxLCAtNCg8cmVnPikKKwkgKiAgIGx1aSAgICAgdDIs IDxoaTIwPgorCSAqICAgYWRkaXcgICB0MiwgdDIsIDxsbzEyPgorCSAqICAgYmVxICAgICB0MSwg dDIsIC5MdG1wMQorCSAqICAgZWJyZWFrICA7IDwtIHJlZ3MtPmVwYworCSAqICAgLkx0bXAxOgor CSAqICAgamFsciAgICA8cmVnPgorCSAqCisJICogV2UgY2FuIHJlYWQgdGhlIGV4cGVjdGVkIHR5 cGUgYW5kIHRoZSB0YXJnZXQgYWRkcmVzcyBmcm9tIHRoZQorCSAqIHJlZ2lzdGVycyBwYXNzZWQg dG8gdGhlIGJlcS9qYWxyIGluc3RydWN0aW9ucy4KKwkgKi8KKwlpZiAoZ2V0X2tlcm5lbF9ub2Zh dWx0KGluc24sICh2b2lkICopcmVncy0+ZXBjIC0gNCkpCisJCXJldHVybiBmYWxzZTsKKwlpZiAo IXJpc2N2X2luc25faXNfYmVxKGluc24pKQorCQlyZXR1cm4gZmFsc2U7CisKKwkqdHlwZSA9ICh1 MzIpcmVnc19wdHJbUlZfRVhUUkFDVF9SUzFfUkVHKGluc24pXTsKKworCWlmIChnZXRfa2VybmVs X25vZmF1bHQoaW5zbiwgKHZvaWQgKilyZWdzLT5lcGMpIHx8CisJICAgIGdldF9rZXJuZWxfbm9m YXVsdChpbnNuLCAodm9pZCAqKXJlZ3MtPmVwYyArIEdFVF9JTlNOX0xFTkdUSChpbnNuKSkpCisJ CXJldHVybiBmYWxzZTsKKworCWlmIChyaXNjdl9pbnNuX2lzX2phbHIoaW5zbikpCisJCXJzMV9u dW0gPSBSVl9FWFRSQUNUX1JTMV9SRUcoaW5zbik7CisJZWxzZSBpZiAocmlzY3ZfaW5zbl9pc19j X2phbHIoaW5zbikpCisJCXJzMV9udW0gPSBSVkNfRVhUUkFDVF9DMl9SUzFfUkVHKGluc24pOwor CWVsc2UKKwkJcmV0dXJuIGZhbHNlOworCisJKnRhcmdldCA9IHJlZ3NfcHRyW3JzMV9udW1dOwor CisJcmV0dXJuIHRydWU7Cit9CisKKy8qCisgKiBDaGVja3MgaWYgdGhlIGVicmVhayB0cmFwIGlz IGJlY2F1c2Ugb2YgYSBDRkkgZmFpbHVyZSwgYW5kIGhhbmRsZXMgdGhlIHRyYXAKKyAqIGlmIG5l ZWRlZC4gUmV0dXJucyBhIGJ1Z190cmFwX3R5cGUgdmFsdWUgc2ltaWxhcmx5IHRvIHJlcG9ydF9i dWcuCisgKi8KK2VudW0gYnVnX3RyYXBfdHlwZSBoYW5kbGVfY2ZpX2ZhaWx1cmUoc3RydWN0IHB0 X3JlZ3MgKnJlZ3MpCit7CisJdW5zaWduZWQgbG9uZyB0YXJnZXQ7CisJdTMyIHR5cGU7CisKKwlp ZiAoIWlzX2NmaV90cmFwKHJlZ3MtPmVwYykpCisJCXJldHVybiBCVUdfVFJBUF9UWVBFX05PTkU7 CisKKwlpZiAoIWRlY29kZV9jZmlfaW5zbihyZWdzLCAmdGFyZ2V0LCAmdHlwZSkpCisJCXJldHVy biByZXBvcnRfY2ZpX2ZhaWx1cmVfbm9hZGRyKHJlZ3MsIHJlZ3MtPmVwYyk7CisKKwlyZXR1cm4g cmVwb3J0X2NmaV9mYWlsdXJlKHJlZ3MsIHJlZ3MtPmVwYywgJnRhcmdldCwgdHlwZSk7Cit9CmRp ZmYgLS1naXQgYS9hcmNoL3Jpc2N2L2tlcm5lbC90cmFwcy5jIGIvYXJjaC9yaXNjdi9rZXJuZWwv dHJhcHMuYwppbmRleCBiZDE5ZTg4NWRjZWMxLi44ZGI4NDhlMmMyNDRjIDEwMDY0NAotLS0gYS9h cmNoL3Jpc2N2L2tlcm5lbC90cmFwcy5jCisrKyBiL2FyY2gvcmlzY3Yva2VybmVsL3RyYXBzLmMK QEAgLTIxLDYgKzIxLDcgQEAKIAogI2luY2x1ZGUgPGFzbS9hc20tcHJvdG90eXBlcy5oPgogI2lu Y2x1ZGUgPGFzbS9idWcuaD4KKyNpbmNsdWRlIDxhc20vY2ZpLmg+CiAjaW5jbHVkZSA8YXNtL2Nz ci5oPgogI2luY2x1ZGUgPGFzbS9wcm9jZXNzb3IuaD4KICNpbmNsdWRlIDxhc20vcHRyYWNlLmg+ CkBAIC0yNDIsNyArMjQzLDggQEAgdm9pZCBoYW5kbGVfYnJlYWsoc3RydWN0IHB0X3JlZ3MgKnJl Z3MpCiAJCQkJCQkJCT09IE5PVElGWV9TVE9QKQogCQlyZXR1cm47CiAjZW5kaWYKLQllbHNlIGlm IChyZXBvcnRfYnVnKHJlZ3MtPmVwYywgcmVncykgPT0gQlVHX1RSQVBfVFlQRV9XQVJOKQorCWVs c2UgaWYgKHJlcG9ydF9idWcocmVncy0+ZXBjLCByZWdzKSA9PSBCVUdfVFJBUF9UWVBFX1dBUk4g fHwKKwkJIGhhbmRsZV9jZmlfZmFpbHVyZShyZWdzKSA9PSBCVUdfVFJBUF9UWVBFX1dBUk4pCiAJ CXJlZ3MtPmVwYyArPSBnZXRfYnJlYWtfaW5zbl9sZW5ndGgocmVncy0+ZXBjKTsKIAllbHNlCiAJ CWRpZShyZWdzLCAiS2VybmVsIEJVRyIpOwotLSAKMi40MC4xCgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtcmlzY3YgbWFpbGluZyBsaXN0Cmxp bnV4LXJpc2N2QGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcv bWFpbG1hbi9saXN0aW5mby9saW51eC1yaXNjdgo= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A008EA8 for ; Sat, 9 Sep 2023 00:38:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0ACACC433CB; Sat, 9 Sep 2023 00:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694219895; bh=c7A2T2kDMKnljYsyhWTIiqMgRghvPMAiuvkhE7iublY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rb9mC/2+CsKfkIAzADNB1R4kkTNwDxmKWzqS29+2qRxKEARPWcAUzTsnWvAkhHZCP x3BZn0NJGr0Ice9uUDSdrgP4dYCfh49LmWdqiU3RibccrCuGqGttPJAoU4Xaue0mN+ JRftnN2wZrZeozNf5A9AoQJIXHZJ8TywxGTcb0OCeMcqA7Xjs7UUPJDOVr7guJKUKd /cCiDy81+CGCPHO2NICaasGhkoDwcxpRr0V+wkLYnK8swOnl+CHcPJwOVANsCGvd+T YtkzAIsTAFjDKEYgMzEY/mpsXwNyGtLuPKTQBGTFRSo4fsrwbxcCrbbLS1uxSgBJpB BWGkxzp97dORQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sami Tolvanen , Kees Cook , Conor Dooley , Nathan Chancellor , Palmer Dabbelt , Sasha Levin , paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, ndesaulniers@google.com, peterz@infradead.org, ajones@ventanamicro.com, heiko@sntech.de, prabhakar.mahadev-lad.rj@bp.renesas.com, liaochang1@huawei.com, namcaov@gmail.com, andy.chiu@sifive.com, guoren@kernel.org, alexghiti@rivosinc.com, bjorn@rivosinc.com, jeeheng.sia@starfivetech.com, jszhang@kernel.org, greentime.hu@sifive.com, masahiroy@kernel.org, apatel@ventanamicro.com, mnissler@rivosinc.com, coelacanthushex@gmail.com, linux-riscv@lists.infradead.org, llvm@lists.linux.dev Subject: [PATCH AUTOSEL 6.4 25/25] riscv: Add CFI error handling Date: Fri, 8 Sep 2023 20:37:13 -0400 Message-Id: <20230909003715.3579761-25-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230909003715.3579761-1-sashal@kernel.org> References: <20230909003715.3579761-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.15 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Sami Tolvanen [ Upstream commit af0ead42f69389cd4ed68e1a4c6cde45c0adb35c ] With CONFIG_CFI_CLANG, the compiler injects a type preamble immediately before each function and a check to validate the target function type before indirect calls: ; type preamble .word function: ... ; indirect call check lw t1, -4(a0) lui t2, addiw t2, t2, beq t1, t2, .Ltmp0 ebreak .Ltmp0: jarl a0 Implement error handling code for the ebreak traps emitted for the checks. This produces the following oops on a CFI failure (generated using lkdtm): [ 21.177245] CFI failure at lkdtm_indirect_call+0x22/0x32 [lkdtm] (target: lkdtm_increment_int+0x0/0x18 [lkdtm]; expected type: 0x3ad55aca) [ 21.178483] Kernel BUG [#1] [ 21.178671] Modules linked in: lkdtm [ 21.179037] CPU: 1 PID: 104 Comm: sh Not tainted 6.3.0-rc6-00037-g37d5ec6297ab #1 [ 21.179511] Hardware name: riscv-virtio,qemu (DT) [ 21.179818] epc : lkdtm_indirect_call+0x22/0x32 [lkdtm] [ 21.180106] ra : lkdtm_CFI_FORWARD_PROTO+0x48/0x7c [lkdtm] [ 21.180426] epc : ffffffff01387092 ra : ffffffff01386f14 sp : ff20000000453cf0 [ 21.180792] gp : ffffffff81308c38 tp : ff6000000243f080 t0 : ff20000000453b78 [ 21.181157] t1 : 000000003ad55aca t2 : 000000007e0c52a5 s0 : ff20000000453d00 [ 21.181506] s1 : 0000000000000001 a0 : ffffffff0138d170 a1 : ffffffff013870bc [ 21.181819] a2 : b5fea48dd89aa700 a3 : 0000000000000001 a4 : 0000000000000fff [ 21.182169] a5 : 0000000000000004 a6 : 00000000000000b7 a7 : 0000000000000000 [ 21.182591] s2 : ff20000000453e78 s3 : ffffffffffffffea s4 : 0000000000000012 [ 21.183001] s5 : ff600000023c7000 s6 : 0000000000000006 s7 : ffffffff013882a0 [ 21.183653] s8 : 0000000000000008 s9 : 0000000000000002 s10: ffffffff0138d878 [ 21.184245] s11: ffffffff0138d878 t3 : 0000000000000003 t4 : 0000000000000000 [ 21.184591] t5 : ffffffff8133df08 t6 : ffffffff8133df07 [ 21.184858] status: 0000000000000120 badaddr: 0000000000000000 cause: 0000000000000003 [ 21.185415] [] lkdtm_indirect_call+0x22/0x32 [lkdtm] [ 21.185772] [] lkdtm_CFI_FORWARD_PROTO+0x48/0x7c [lkdtm] [ 21.186093] [] lkdtm_do_action+0x22/0x34 [lkdtm] [ 21.186445] [] direct_entry+0x128/0x13a [lkdtm] [ 21.186817] [] full_proxy_write+0x58/0xb2 [ 21.187352] [] vfs_write+0x14c/0x33a [ 21.187644] [] ksys_write+0x64/0xd4 [ 21.187832] [] sys_write+0xe/0x1a [ 21.188171] [] ret_from_syscall+0x0/0x2 [ 21.188595] Code: 0513 0f65 a303 ffc5 53b7 7e0c 839b 2a53 0363 0073 (9002) 9582 [ 21.189178] ---[ end trace 0000000000000000 ]--- [ 21.189590] Kernel panic - not syncing: Fatal exception Reviewed-by: Kees Cook Reviewed-by: Conor Dooley # ISA bits Tested-by: Nathan Chancellor Signed-off-by: Sami Tolvanen Link: https://lore.kernel.org/r/20230710183544.999540-12-samitolvanen@google.com Signed-off-by: Palmer Dabbelt Signed-off-by: Sasha Levin --- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/cfi.h | 22 ++++++++++ arch/riscv/include/asm/insn.h | 10 +++++ arch/riscv/kernel/Makefile | 2 + arch/riscv/kernel/cfi.c | 77 +++++++++++++++++++++++++++++++++++ arch/riscv/kernel/traps.c | 4 +- 6 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 arch/riscv/include/asm/cfi.h create mode 100644 arch/riscv/kernel/cfi.c diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 052845384ed38..36dd0390b8257 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -45,6 +45,7 @@ config RISCV select ARCH_SUPPORTS_PAGE_TABLE_CHECK if MMU select ARCH_USE_MEMTEST select ARCH_USE_QUEUED_RWLOCKS + select ARCH_USES_CFI_TRAPS if CFI_CLANG select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU select ARCH_WANT_FRAME_POINTERS select ARCH_WANT_GENERAL_HUGETLB if !RISCV_ISA_SVNAPOT diff --git a/arch/riscv/include/asm/cfi.h b/arch/riscv/include/asm/cfi.h new file mode 100644 index 0000000000000..56bf9d69d5e38 --- /dev/null +++ b/arch/riscv/include/asm/cfi.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_RISCV_CFI_H +#define _ASM_RISCV_CFI_H + +/* + * Clang Control Flow Integrity (CFI) support. + * + * Copyright (C) 2023 Google LLC + */ + +#include + +#ifdef CONFIG_CFI_CLANG +enum bug_trap_type handle_cfi_failure(struct pt_regs *regs); +#else +static inline enum bug_trap_type handle_cfi_failure(struct pt_regs *regs) +{ + return BUG_TRAP_TYPE_NONE; +} +#endif /* CONFIG_CFI_CLANG */ + +#endif /* _ASM_RISCV_CFI_H */ diff --git a/arch/riscv/include/asm/insn.h b/arch/riscv/include/asm/insn.h index 603095c913e37..bbd878d4815ce 100644 --- a/arch/riscv/include/asm/insn.h +++ b/arch/riscv/include/asm/insn.h @@ -63,6 +63,7 @@ #define RVG_RS1_OPOFF 15 #define RVG_RS2_OPOFF 20 #define RVG_RD_OPOFF 7 +#define RVG_RS1_MASK GENMASK(4, 0) #define RVG_RD_MASK GENMASK(4, 0) /* The bit field of immediate value in RVC J instruction */ @@ -130,6 +131,7 @@ #define RVC_C2_RS1_OPOFF 7 #define RVC_C2_RS2_OPOFF 2 #define RVC_C2_RD_OPOFF 7 +#define RVC_C2_RS1_MASK GENMASK(4, 0) /* parts of opcode for RVG*/ #define RVG_OPCODE_FENCE 0x0f @@ -269,6 +271,10 @@ static __always_inline bool riscv_insn_is_c_jalr(u32 code) #define RV_X(X, s, mask) (((X) >> (s)) & (mask)) #define RVC_X(X, s, mask) RV_X(X, s, mask) +#define RV_EXTRACT_RS1_REG(x) \ + ({typeof(x) x_ = (x); \ + (RV_X(x_, RVG_RS1_OPOFF, RVG_RS1_MASK)); }) + #define RV_EXTRACT_RD_REG(x) \ ({typeof(x) x_ = (x); \ (RV_X(x_, RVG_RD_OPOFF, RVG_RD_MASK)); }) @@ -296,6 +302,10 @@ static __always_inline bool riscv_insn_is_c_jalr(u32 code) (RV_X(x_, RV_B_IMM_11_OPOFF, RV_B_IMM_11_MASK) << RV_B_IMM_11_OFF) | \ (RV_IMM_SIGN(x_) << RV_B_IMM_SIGN_OFF); }) +#define RVC_EXTRACT_C2_RS1_REG(x) \ + ({typeof(x) x_ = (x); \ + (RV_X(x_, RVC_C2_RS1_OPOFF, RVC_C2_RS1_MASK)); }) + #define RVC_EXTRACT_JTYPE_IMM(x) \ ({typeof(x) x_ = (x); \ (RVC_X(x_, RVC_J_IMM_3_1_OPOFF, RVC_J_IMM_3_1_MASK) << RVC_J_IMM_3_1_OFF) | \ diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 153864e4f3996..c173a7cbf4e11 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -90,6 +90,8 @@ obj-$(CONFIG_CRASH_CORE) += crash_core.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o +obj-$(CONFIG_CFI_CLANG) += cfi.o + obj-$(CONFIG_EFI) += efi.o obj-$(CONFIG_COMPAT) += compat_syscall_table.o obj-$(CONFIG_COMPAT) += compat_signal.o diff --git a/arch/riscv/kernel/cfi.c b/arch/riscv/kernel/cfi.c new file mode 100644 index 0000000000000..820158d7a2913 --- /dev/null +++ b/arch/riscv/kernel/cfi.c @@ -0,0 +1,77 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Clang Control Flow Integrity (CFI) support. + * + * Copyright (C) 2023 Google LLC + */ +#include +#include + +/* + * Returns the target address and the expected type when regs->epc points + * to a compiler-generated CFI trap. + */ +static bool decode_cfi_insn(struct pt_regs *regs, unsigned long *target, + u32 *type) +{ + unsigned long *regs_ptr = (unsigned long *)regs; + int rs1_num; + u32 insn; + + *target = *type = 0; + + /* + * The compiler generates the following instruction sequence + * for indirect call checks: + * + *   lw t1, -4() + * lui t2, + * addiw t2, t2, + * beq t1, t2, .Ltmp1 + * ebreak ; <- regs->epc + * .Ltmp1: + * jalr + * + * We can read the expected type and the target address from the + * registers passed to the beq/jalr instructions. + */ + if (get_kernel_nofault(insn, (void *)regs->epc - 4)) + return false; + if (!riscv_insn_is_beq(insn)) + return false; + + *type = (u32)regs_ptr[RV_EXTRACT_RS1_REG(insn)]; + + if (get_kernel_nofault(insn, (void *)regs->epc) || + get_kernel_nofault(insn, (void *)regs->epc + GET_INSN_LENGTH(insn))) + return false; + + if (riscv_insn_is_jalr(insn)) + rs1_num = RV_EXTRACT_RS1_REG(insn); + else if (riscv_insn_is_c_jalr(insn)) + rs1_num = RVC_EXTRACT_C2_RS1_REG(insn); + else + return false; + + *target = regs_ptr[rs1_num]; + + return true; +} + +/* + * Checks if the ebreak trap is because of a CFI failure, and handles the trap + * if needed. Returns a bug_trap_type value similarly to report_bug. + */ +enum bug_trap_type handle_cfi_failure(struct pt_regs *regs) +{ + unsigned long target; + u32 type; + + if (!is_cfi_trap(regs->epc)) + return BUG_TRAP_TYPE_NONE; + + if (!decode_cfi_insn(regs, &target, &type)) + return report_cfi_failure_noaddr(regs, regs->epc); + + return report_cfi_failure(regs, regs->epc, &target, type); +} diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index bd19e885dcec1..8db848e2c244c 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -242,7 +243,8 @@ void handle_break(struct pt_regs *regs) == NOTIFY_STOP) return; #endif - else if (report_bug(regs->epc, regs) == BUG_TRAP_TYPE_WARN) + else if (report_bug(regs->epc, regs) == BUG_TRAP_TYPE_WARN || + handle_cfi_failure(regs) == BUG_TRAP_TYPE_WARN) regs->epc += get_break_insn_length(regs->epc); else die(regs, "Kernel BUG"); -- 2.40.1