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 755EAEB64D9 for ; Thu, 29 Jun 2023 23:43:09 +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:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=oyHGt6h9jnU9OfVE3JJUsWxhfqsEu+kErqN+/ysYSrw=; b=I8G1gk8TEVDLvKKQ2lua+Xy/3+ i7BqkFJ52+oWRkzU+NyKmIjkMPXdPpndW3Lv/SrpwKJxBgBPXtcfbgpDPup5Ff70QfVkU4bieKt6k duiHG6zYQgiY387HcFkbifJSWttS3ed4CnDSbRdQAxLacr0HKHappLhRu+e0tYb33z5O55FyXL5Lq NPj7aaOGuBAeCylZvCfJSFaIllwUHt2LGKQB2w1g+Kp4iAiI0/pcm8BqMDgE/HYusgFoAhwkRM5MD DyaFc8BHYVt/umXWZSQrPmiKSqBcDZcGp+GzJcHvspYT67uW1k/XHZUNjUanD30FHAiS50rry+BEh WOryrIyQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qF1I0-002Tyq-1N; Thu, 29 Jun 2023 23:43:04 +0000 Received: from mail-pf1-x449.google.com ([2607:f8b0:4864:20::449]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qF1Hu-002TvS-2I for linux-riscv@lists.infradead.org; Thu, 29 Jun 2023 23:43:00 +0000 Received: by mail-pf1-x449.google.com with SMTP id d2e1a72fcca58-66a44bf4651so843836b3a.1 for ; Thu, 29 Jun 2023 16:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1688082177; x=1690674177; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=kH7bkPbO18xX/Wp0GpqGpLlOQ0f95hD6FnRtLDJvT1U=; b=MOrJxSP3sVqGm+w0js/kIw42CYZEUP0oOJNMS+uIOa3MELAjgpbyTEzy/4B24ur+OK qM7qAuosF6u0oM27xEmeVggBJ+6/NH+9EoAVMOBltCUDX8waMif7DUAE8zgVrP066VKz JZYmWrGCxkCV1ew5vNDDksZ/wRF/Zoujs622lDGtfKg6dUgwqu1Buhk5NRH1fTLjNmt8 NUyWcokBJNyaKD+b76OJOILtSe24hjIImin9Dzgx3z7SSWX+3BpmVK9w1Ah3TO1Ekw6T q0BczkHxDyFoQVa4T2Ls121wOtYzOA/qMkqb3C89vnQyR85YIGae/1Kwcla942IWNnDu AXTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688082177; x=1690674177; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=kH7bkPbO18xX/Wp0GpqGpLlOQ0f95hD6FnRtLDJvT1U=; b=PmrSIcElwT1EvsSbiGnQjpfOIW25C+1ta/Qb/67SHfUKdDDwXV5Z3GedxNDc8BqtR4 VDsWYC4xtvm+ubgKDCfvOrKjMJ6lVttq4zxsUrvuyDTkUFkNKoH+Q257cURB3HCIaWsA T8hnqXe2I8i1H08lWQ5iuy4EqHi9CcJoXM7FhVL+n5Xiez3YNimdGv2PIQZV7eAaWuiw HY+gSdzylfrPexUaHnXSGvcn9UOMQAxKZwUrw72sP87HSwKvzq5qwucdSsEsySNsLIa2 fiwZkcIRHbk8JnVQaN1o/ZCvhymvP/ewmpnI4ok8fn9BvepZlMNum2+PjNJXRnkTvts1 6bnw== X-Gm-Message-State: AC+VfDw0bc20NljqYa0y3ltyUKZPT6Kwqshdkwlbcd0JxmtMChdd+2Ne bkFebw5qpYu4HhWsazbPnf8kjWZSjZi+WJlAST8= X-Google-Smtp-Source: ACHHUZ54tMcYLAqtFQ4eD7Co9823u9Z85Yql+d2HDqherGgBCI4z4EkToq8lC91y+5fbCwaKDbVpEDDVYz5UAdJejDo= X-Received: from samitolvanen.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:4f92]) (user=samitolvanen job=sendgmr) by 2002:a05:6a00:18a6:b0:67b:8602:aa10 with SMTP id x38-20020a056a0018a600b0067b8602aa10mr1871084pfh.0.1688082176944; Thu, 29 Jun 2023 16:42:56 -0700 (PDT) Date: Thu, 29 Jun 2023 23:42:49 +0000 In-Reply-To: <20230629234244.1752366-8-samitolvanen@google.com> Mime-Version: 1.0 References: <20230629234244.1752366-8-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=9436; i=samitolvanen@google.com; h=from:subject; bh=JZNR4FrhRgjhD3OE65/zHFRoFa/eW0jA8NKJ4VpUQAM=; b=owEB7QES/pANAwAKAUy19oSLvFbuAcsmYgBknhb17pDdOWUqLhJ1JUH+3wVLRO6EhFWeGwkjK 7BieuQqsc+JAbMEAAEKAB0WIQQ1zPtjsoPW0663g5RMtfaEi7xW7gUCZJ4W9QAKCRBMtfaEi7xW 7rBdC/9osT4E49rQweMxnUcqovViVIiMB+HeQOW+PQuZH8/EBALEW5KQD2WoZyN/to24b+CwgXK b1rrMZ+HQQlfYYiWdS8D1o3sa2GYK6f8koSaggQIj2kVFoNzOuYnLt5xGZBifcfUPONMLMaYZTf mlqJvD5HFVi6h4Qxs5ldTItdrbjOaLz/T4eTqRVHaQOkhd2rJgu+WAgJbOngaGxxtR70yikAiCf W0pw2m8Pwk1v7zso9VmFhwmvof8W6Xnu4bG+knxaOu/U7ih2C0X/PQNHEOXbF7W9mUdrDUbGqtU giHYTQDuORwbMfrlmL3LPs5lGweV3g2tiILj+obadtUVNSm4vVna8O6+bn7Jlke3doKZwCV6rYU nHzSfo1wvr5CVp+Ky0bLf3DY0QkL+ovuUbM1c5nRG3XxnKHXAUK25nrPmlq/z5ielGMqymHg7bC /GU8cbvrTijynsfGXpREBVxgFz5cPMaL4FG69n8bEaCVytbhhs/hrmLGwI0pno1dRpW4Y= X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230629234244.1752366-12-samitolvanen@google.com> Subject: [PATCH 4/6] riscv: Add CFI error handling From: Sami Tolvanen To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Kees Cook Cc: Nathan Chancellor , Nick Desaulniers , linux-riscv@lists.infradead.org, llvm@lists.linux.dev, linux-kernel@vger.kernel.org, Sami Tolvanen X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230629_164258_748689_A8046167 X-CRM114-Status: GOOD ( 23.99 ) 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 V2l0aCBDT05GSUdfQ0ZJX0NMQU5HLCB0aGUgY29tcGlsZXIgaW5qZWN0cyBhIHR5cGUgcHJlYW1i bGUgaW1tZWRpYXRlbHkKYmVmb3JlIGVhY2ggZnVuY3Rpb24gYW5kIGEgY2hlY2sgdG8gdmFsaWRh dGUgdGhlIHRhcmdldCBmdW5jdGlvbiB0eXBlCmJlZm9yZSBpbmRpcmVjdCBjYWxsczoKCiAgOyB0 eXBlIHByZWFtYmxlCiAgICAud29yZCA8aWQ+CiAgZnVuY3Rpb246CiAgICAuLi4KICA7IGluZGly ZWN0IGNhbGwgY2hlY2sKICAgIGx3ICAgICAgdDEsIC00KGEwKQogICAgbHVpICAgICB0MiwgPGhp MjA+CiAgICBhZGRpdyAgIHQyLCB0MiwgPGxvMTI+CiAgICBiZXEgICAgIHQxLCB0MiwgLkx0bXAw CiAgICBlYnJlYWsKICAuTHRtcDA6CiAgICBqYXJsICAgIGEwCgpJbXBsZW1lbnQgZXJyb3IgaGFu ZGxpbmcgY29kZSBmb3IgdGhlIGVicmVhayB0cmFwcyBlbWl0dGVkIGZvciB0aGUKY2hlY2tzLiBU aGlzIHByb2R1Y2VzIHRoZSBmb2xsb3dpbmcgb29wcyBvbiBhIENGSSBmYWlsdXJlIChnZW5lcmF0 ZWQKdXNpbmcgbGtkdG0pOgoKWyAgIDIxLjE3NzI0NV0gQ0ZJIGZhaWx1cmUgYXQgbGtkdG1faW5k aXJlY3RfY2FsbCsweDIyLzB4MzIgW2xrZHRtXQoodGFyZ2V0OiBsa2R0bV9pbmNyZW1lbnRfaW50 KzB4MC8weDE4IFtsa2R0bV07IGV4cGVjdGVkIHR5cGU6IDB4M2FkNTVhY2EpClsgICAyMS4xNzg0 ODNdIEtlcm5lbCBCVUcgWyMxXQpbICAgMjEuMTc4NjcxXSBNb2R1bGVzIGxpbmtlZCBpbjogbGtk dG0KWyAgIDIxLjE3OTAzN10gQ1BVOiAxIFBJRDogMTA0IENvbW06IHNoIE5vdCB0YWludGVkCjYu My4wLXJjNi0wMDAzNy1nMzdkNWVjNjI5N2FiICMxClsgICAyMS4xNzk1MTFdIEhhcmR3YXJlIG5h bWU6IHJpc2N2LXZpcnRpbyxxZW11IChEVCkKWyAgIDIxLjE3OTgxOF0gZXBjIDogbGtkdG1faW5k aXJlY3RfY2FsbCsweDIyLzB4MzIgW2xrZHRtXQpbICAgMjEuMTgwMTA2XSAgcmEgOiBsa2R0bV9D RklfRk9SV0FSRF9QUk9UTysweDQ4LzB4N2MgW2xrZHRtXQpbICAgMjEuMTgwNDI2XSBlcGMgOiBm ZmZmZmZmZjAxMzg3MDkyIHJhIDogZmZmZmZmZmYwMTM4NmYxNCBzcCA6IGZmMjAwMDAwMDA0NTNj ZjAKWyAgIDIxLjE4MDc5Ml0gIGdwIDogZmZmZmZmZmY4MTMwOGMzOCB0cCA6IGZmNjAwMDAwMDI0 M2YwODAgdDAgOiBmZjIwMDAwMDAwNDUzYjc4ClsgICAyMS4xODExNTddICB0MSA6IDAwMDAwMDAw M2FkNTVhY2EgdDIgOiAwMDAwMDAwMDdlMGM1MmE1IHMwIDogZmYyMDAwMDAwMDQ1M2QwMApbICAg MjEuMTgxNTA2XSAgczEgOiAwMDAwMDAwMDAwMDAwMDAxIGEwIDogZmZmZmZmZmYwMTM4ZDE3MCBh MSA6IGZmZmZmZmZmMDEzODcwYmMKWyAgIDIxLjE4MTgxOV0gIGEyIDogYjVmZWE0OGRkODlhYTcw MCBhMyA6IDAwMDAwMDAwMDAwMDAwMDEgYTQgOiAwMDAwMDAwMDAwMDAwZmZmClsgICAyMS4xODIx NjldICBhNSA6IDAwMDAwMDAwMDAwMDAwMDQgYTYgOiAwMDAwMDAwMDAwMDAwMGI3IGE3IDogMDAw MDAwMDAwMDAwMDAwMApbICAgMjEuMTgyNTkxXSAgczIgOiBmZjIwMDAwMDAwNDUzZTc4IHMzIDog ZmZmZmZmZmZmZmZmZmZlYSBzNCA6IDAwMDAwMDAwMDAwMDAwMTIKWyAgIDIxLjE4MzAwMV0gIHM1 IDogZmY2MDAwMDAwMjNjNzAwMCBzNiA6IDAwMDAwMDAwMDAwMDAwMDYgczcgOiBmZmZmZmZmZjAx Mzg4MmEwClsgICAyMS4xODM2NTNdICBzOCA6IDAwMDAwMDAwMDAwMDAwMDggczkgOiAwMDAwMDAw MDAwMDAwMDAyIHMxMDogZmZmZmZmZmYwMTM4ZDg3OApbICAgMjEuMTg0MjQ1XSAgczExOiBmZmZm ZmZmZjAxMzhkODc4IHQzIDogMDAwMDAwMDAwMDAwMDAwMyB0NCA6IDAwMDAwMDAwMDAwMDAwMDAK WyAgIDIxLjE4NDU5MV0gIHQ1IDogZmZmZmZmZmY4MTMzZGYwOCB0NiA6IGZmZmZmZmZmODEzM2Rm MDcKWyAgIDIxLjE4NDg1OF0gc3RhdHVzOiAwMDAwMDAwMDAwMDAwMTIwIGJhZGFkZHI6IDAwMDAw MDAwMDAwMDAwMDAKY2F1c2U6IDAwMDAwMDAwMDAwMDAwMDMKWyAgIDIxLjE4NTQxNV0gWzxmZmZm ZmZmZjAxMzg3MDkyPl0gbGtkdG1faW5kaXJlY3RfY2FsbCsweDIyLzB4MzIgW2xrZHRtXQpbICAg MjEuMTg1NzcyXSBbPGZmZmZmZmZmMDEzODZmMTQ+XSBsa2R0bV9DRklfRk9SV0FSRF9QUk9UTysw eDQ4LzB4N2MgW2xrZHRtXQpbICAgMjEuMTg2MDkzXSBbPGZmZmZmZmZmMDEzODM1NTI+XSBsa2R0 bV9kb19hY3Rpb24rMHgyMi8weDM0IFtsa2R0bV0KWyAgIDIxLjE4NjQ0NV0gWzxmZmZmZmZmZjAx MzgzNTBjPl0gZGlyZWN0X2VudHJ5KzB4MTI4LzB4MTNhIFtsa2R0bV0KWyAgIDIxLjE4NjgxN10g WzxmZmZmZmZmZjgwMzNlZDhjPl0gZnVsbF9wcm94eV93cml0ZSsweDU4LzB4YjIKWyAgIDIxLjE4 NzM1Ml0gWzxmZmZmZmZmZjgwMWQ0ZmU4Pl0gdmZzX3dyaXRlKzB4MTRjLzB4MzNhClsgICAyMS4x ODc2NDRdIFs8ZmZmZmZmZmY4MDFkNTMyOD5dIGtzeXNfd3JpdGUrMHg2NC8weGQ0ClsgICAyMS4x ODc4MzJdIFs8ZmZmZmZmZmY4MDFkNTNhNj5dIHN5c193cml0ZSsweGUvMHgxYQpbICAgMjEuMTg4 MTcxXSBbPGZmZmZmZmZmODAwMDM5OTY+XSByZXRfZnJvbV9zeXNjYWxsKzB4MC8weDIKWyAgIDIx LjE4ODU5NV0gQ29kZTogMDUxMyAwZjY1IGEzMDMgZmZjNSA1M2I3IDdlMGMgODM5YiAyYTUzIDAz NjMgMDA3MyAoOTAwMikgOTU4MgpbICAgMjEuMTg5MTc4XSAtLS1bIGVuZCB0cmFjZSAwMDAwMDAw MDAwMDAwMDAwIF0tLS0KWyAgIDIxLjE4OTU5MF0gS2VybmVsIHBhbmljIC0gbm90IHN5bmNpbmc6 IEZhdGFsIGV4Y2VwdGlvbgoKU2lnbmVkLW9mZi1ieTogU2FtaSBUb2x2YW5lbiA8c2FtaXRvbHZh bmVuQGdvb2dsZS5jb20+Ci0tLQogYXJjaC9yaXNjdi9LY29uZmlnICAgICAgICAgICAgfCAgMSAr CiBhcmNoL3Jpc2N2L2luY2x1ZGUvYXNtL2NmaS5oICB8IDIyICsrKysrKysrKysKIGFyY2gvcmlz Y3YvaW5jbHVkZS9hc20vaW5zbi5oIHwgMTAgKysrKysKIGFyY2gvcmlzY3Yva2VybmVsL01ha2Vm aWxlICAgIHwgIDIgKwogYXJjaC9yaXNjdi9rZXJuZWwvY2ZpLmMgICAgICAgfCA3NyArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKwogYXJjaC9yaXNjdi9rZXJuZWwvdHJhcHMuYyAg ICAgfCAgNCArLQogNiBmaWxlcyBjaGFuZ2VkLCAxMTUgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlv bigtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGFyY2gvcmlzY3YvaW5jbHVkZS9hc20vY2ZpLmgKIGNy ZWF0ZSBtb2RlIDEwMDY0NCBhcmNoL3Jpc2N2L2tlcm5lbC9jZmkuYwoKZGlmZiAtLWdpdCBhL2Fy Y2gvcmlzY3YvS2NvbmZpZyBiL2FyY2gvcmlzY3YvS2NvbmZpZwppbmRleCBiNTRhODMwZWI1YzYu LjIwYTQwOTI3MTc1ZSAxMDA2NDQKLS0tIGEvYXJjaC9yaXNjdi9LY29uZmlnCisrKyBiL2FyY2gv cmlzY3YvS2NvbmZpZwpAQCAtNDQsNiArNDQsNyBAQCBjb25maWcgUklTQ1YKIAlzZWxlY3QgQVJD SF9TVVBQT1JUU19ERUJVR19QQUdFQUxMT0MgaWYgTU1VCiAJc2VsZWN0IEFSQ0hfU1VQUE9SVFNf SFVHRVRMQkZTIGlmIE1NVQogCXNlbGVjdCBBUkNIX1NVUFBPUlRTX1BBR0VfVEFCTEVfQ0hFQ0sg aWYgTU1VCisJc2VsZWN0IEFSQ0hfVVNFU19DRklfVFJBUFMgaWYgQ0ZJX0NMQU5HCiAJc2VsZWN0 IEFSQ0hfVVNFX01FTVRFU1QKIAlzZWxlY3QgQVJDSF9VU0VfUVVFVUVEX1JXTE9DS1MKIAlzZWxl Y3QgQVJDSF9XQU5UX0RFRkFVTFRfVE9QRE9XTl9NTUFQX0xBWU9VVCBpZiBNTVUKZGlmZiAtLWdp dCBhL2FyY2gvcmlzY3YvaW5jbHVkZS9hc20vY2ZpLmggYi9hcmNoL3Jpc2N2L2luY2x1ZGUvYXNt L2NmaS5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uNTZiZjlkNjlk NWUzCi0tLSAvZGV2L251bGwKKysrIGIvYXJjaC9yaXNjdi9pbmNsdWRlL2FzbS9jZmkuaApAQCAt MCwwICsxLDIyIEBACisvKiBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogR1BMLTIuMCAqLworI2lm bmRlZiBfQVNNX1JJU0NWX0NGSV9ICisjZGVmaW5lIF9BU01fUklTQ1ZfQ0ZJX0gKKworLyoKKyAq IENsYW5nIENvbnRyb2wgRmxvdyBJbnRlZ3JpdHkgKENGSSkgc3VwcG9ydC4KKyAqCisgKiBDb3B5 cmlnaHQgKEMpIDIwMjMgR29vZ2xlIExMQworICovCisKKyNpbmNsdWRlIDxsaW51eC9jZmkuaD4K KworI2lmZGVmIENPTkZJR19DRklfQ0xBTkcKK2VudW0gYnVnX3RyYXBfdHlwZSBoYW5kbGVfY2Zp X2ZhaWx1cmUoc3RydWN0IHB0X3JlZ3MgKnJlZ3MpOworI2Vsc2UKK3N0YXRpYyBpbmxpbmUgZW51 bSBidWdfdHJhcF90eXBlIGhhbmRsZV9jZmlfZmFpbHVyZShzdHJ1Y3QgcHRfcmVncyAqcmVncykK K3sKKwlyZXR1cm4gQlVHX1RSQVBfVFlQRV9OT05FOworfQorI2VuZGlmIC8qIENPTkZJR19DRklf Q0xBTkcgKi8KKworI2VuZGlmIC8qIF9BU01fUklTQ1ZfQ0ZJX0ggKi8KZGlmZiAtLWdpdCBhL2Fy Y2gvcmlzY3YvaW5jbHVkZS9hc20vaW5zbi5oIGIvYXJjaC9yaXNjdi9pbmNsdWRlL2FzbS9pbnNu LmgKaW5kZXggOGQ1Yzg0ZjJkNWVmLi40NWJjNDg1ZmNmM2YgMTAwNjQ0Ci0tLSBhL2FyY2gvcmlz Y3YvaW5jbHVkZS9hc20vaW5zbi5oCisrKyBiL2FyY2gvcmlzY3YvaW5jbHVkZS9hc20vaW5zbi5o CkBAIC02Myw2ICs2Myw3IEBACiAjZGVmaW5lIFJWR19SUzFfT1BPRkYJCTE1CiAjZGVmaW5lIFJW R19SUzJfT1BPRkYJCTIwCiAjZGVmaW5lIFJWR19SRF9PUE9GRgkJNworI2RlZmluZSBSVkdfUlMx X01BU0sJCUdFTk1BU0soNCwgMCkKICNkZWZpbmUgUlZHX1JEX01BU0sJCUdFTk1BU0soNCwgMCkK IAogLyogVGhlIGJpdCBmaWVsZCBvZiBpbW1lZGlhdGUgdmFsdWUgaW4gUlZDIEogaW5zdHJ1Y3Rp b24gKi8KQEAgLTEyOSw2ICsxMzAsNyBAQAogI2RlZmluZSBSVkNfQzJfUlMxX09QT0ZGCTcKICNk ZWZpbmUgUlZDX0MyX1JTMl9PUE9GRgkyCiAjZGVmaW5lIFJWQ19DMl9SRF9PUE9GRgkJNworI2Rl ZmluZSBSVkNfQzJfUlMxX01BU0sJCUdFTk1BU0soNCwgMCkKIAogLyogcGFydHMgb2Ygb3Bjb2Rl IGZvciBSVkcqLwogI2RlZmluZSBSVkdfT1BDT0RFX0ZFTkNFCTB4MGYKQEAgLTI1OCw2ICsyNjAs MTAgQEAgc3RhdGljIF9fYWx3YXlzX2lubGluZSBib29sIHJpc2N2X2luc25faXNfYnJhbmNoKHUz MiBjb2RlKQogI2RlZmluZSBSVl9YKFgsIHMsIG1hc2spICAoKChYKSA+PiAocykpICYgKG1hc2sp KQogI2RlZmluZSBSVkNfWChYLCBzLCBtYXNrKSBSVl9YKFgsIHMsIG1hc2spCiAKKyNkZWZpbmUg UlZfRVhUUkFDVF9SUzFfUkVHKHgpIFwKKwkoe3R5cGVvZih4KSB4XyA9ICh4KTsgXAorCShSVl9Y KHhfLCBSVkdfUlMxX09QT0ZGLCBSVkdfUlMxX01BU0spKTsgfSkKKwogI2RlZmluZSBSVl9FWFRS QUNUX1JEX1JFRyh4KSBcCiAJKHt0eXBlb2YoeCkgeF8gPSAoeCk7IFwKIAkoUlZfWCh4XywgUlZH X1JEX09QT0ZGLCBSVkdfUkRfTUFTSykpOyB9KQpAQCAtMjg1LDYgKzI5MSwxMCBAQCBzdGF0aWMg X19hbHdheXNfaW5saW5lIGJvb2wgcmlzY3ZfaW5zbl9pc19icmFuY2godTMyIGNvZGUpCiAJKFJW X1goeF8sIFJWX0JfSU1NXzExX09QT0ZGLCBSVl9CX0lNTV8xMV9NQVNLKSA8PCBSVl9CX0lNTV8x MV9PRkYpIHwgXAogCShSVl9JTU1fU0lHTih4XykgPDwgUlZfQl9JTU1fU0lHTl9PRkYpOyB9KQog CisjZGVmaW5lIFJWQ19FWFRSQUNUX0MyX1JTMV9SRUcoeCkgXAorCSh7dHlwZW9mKHgpIHhfID0g KHgpOyBcCisJKFJWX1goeF8sIFJWQ19DMl9SUzFfT1BPRkYsIFJWQ19DMl9SUzFfTUFTSykpOyB9 KQorCiAjZGVmaW5lIFJWQ19FWFRSQUNUX0pUWVBFX0lNTSh4KSBcCiAJKHt0eXBlb2YoeCkgeF8g PSAoeCk7IFwKIAkoUlZDX1goeF8sIFJWQ19KX0lNTV8zXzFfT1BPRkYsIFJWQ19KX0lNTV8zXzFf TUFTSykgPDwgUlZDX0pfSU1NXzNfMV9PRkYpIHwgXApkaWZmIC0tZ2l0IGEvYXJjaC9yaXNjdi9r ZXJuZWwvTWFrZWZpbGUgYi9hcmNoL3Jpc2N2L2tlcm5lbC9NYWtlZmlsZQppbmRleCAxNTM4NjRl NGYzOTkuLmMxNzNhN2NiZjRlMSAxMDA2NDQKLS0tIGEvYXJjaC9yaXNjdi9rZXJuZWwvTWFrZWZp bGUKKysrIGIvYXJjaC9yaXNjdi9rZXJuZWwvTWFrZWZpbGUKQEAgLTkwLDYgKzkwLDggQEAgb2Jq LSQoQ09ORklHX0NSQVNIX0NPUkUpCSs9IGNyYXNoX2NvcmUubwogCiBvYmotJChDT05GSUdfSlVN UF9MQUJFTCkJKz0ganVtcF9sYWJlbC5vCiAKK29iai0kKENPTkZJR19DRklfQ0xBTkcpCQkrPSBj ZmkubworCiBvYmotJChDT05GSUdfRUZJKQkJKz0gZWZpLm8KIG9iai0kKENPTkZJR19DT01QQVQp CQkrPSBjb21wYXRfc3lzY2FsbF90YWJsZS5vCiBvYmotJChDT05GSUdfQ09NUEFUKQkJKz0gY29t cGF0X3NpZ25hbC5vCmRpZmYgLS1naXQgYS9hcmNoL3Jpc2N2L2tlcm5lbC9jZmkuYyBiL2FyY2gv cmlzY3Yva2VybmVsL2NmaS5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MC4uODIwMTU4ZDdhMjkxCi0tLSAvZGV2L251bGwKKysrIGIvYXJjaC9yaXNjdi9rZXJuZWwvY2Zp LmMKQEAgLTAsMCArMSw3NyBAQAorLy8gU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEdQTC0yLjAK Ky8qCisgKiBDbGFuZyBDb250cm9sIEZsb3cgSW50ZWdyaXR5IChDRkkpIHN1cHBvcnQuCisgKgor ICogQ29weXJpZ2h0IChDKSAyMDIzIEdvb2dsZSBMTEMKKyAqLworI2luY2x1ZGUgPGFzbS9jZmku aD4KKyNpbmNsdWRlIDxhc20vaW5zbi5oPgorCisvKgorICogUmV0dXJucyB0aGUgdGFyZ2V0IGFk ZHJlc3MgYW5kIHRoZSBleHBlY3RlZCB0eXBlIHdoZW4gcmVncy0+ZXBjIHBvaW50cworICogdG8g YSBjb21waWxlci1nZW5lcmF0ZWQgQ0ZJIHRyYXAuCisgKi8KK3N0YXRpYyBib29sIGRlY29kZV9j ZmlfaW5zbihzdHJ1Y3QgcHRfcmVncyAqcmVncywgdW5zaWduZWQgbG9uZyAqdGFyZ2V0LAorCQkJ ICAgIHUzMiAqdHlwZSkKK3sKKwl1bnNpZ25lZCBsb25nICpyZWdzX3B0ciA9ICh1bnNpZ25lZCBs b25nICopcmVnczsKKwlpbnQgcnMxX251bTsKKwl1MzIgaW5zbjsKKworCSp0YXJnZXQgPSAqdHlw ZSA9IDA7CisKKwkvKgorCSAqIFRoZSBjb21waWxlciBnZW5lcmF0ZXMgdGhlIGZvbGxvd2luZyBp bnN0cnVjdGlvbiBzZXF1ZW5jZQorCSAqIGZvciBpbmRpcmVjdCBjYWxsIGNoZWNrczoKKwkgKgor CSAqIMKgIGx3ICAgICAgdDEsIC00KDxyZWc+KQorCSAqICAgbHVpICAgICB0MiwgPGhpMjA+CisJ ICogICBhZGRpdyAgIHQyLCB0MiwgPGxvMTI+CisJICogICBiZXEgICAgIHQxLCB0MiwgLkx0bXAx CisJICogICBlYnJlYWsgIDsgPC0gcmVncy0+ZXBjCisJICogICAuTHRtcDE6CisJICogICBqYWxy ICAgIDxyZWc+CisJICoKKwkgKiBXZSBjYW4gcmVhZCB0aGUgZXhwZWN0ZWQgdHlwZSBhbmQgdGhl IHRhcmdldCBhZGRyZXNzIGZyb20gdGhlCisJICogcmVnaXN0ZXJzIHBhc3NlZCB0byB0aGUgYmVx L2phbHIgaW5zdHJ1Y3Rpb25zLgorCSAqLworCWlmIChnZXRfa2VybmVsX25vZmF1bHQoaW5zbiwg KHZvaWQgKilyZWdzLT5lcGMgLSA0KSkKKwkJcmV0dXJuIGZhbHNlOworCWlmICghcmlzY3ZfaW5z bl9pc19iZXEoaW5zbikpCisJCXJldHVybiBmYWxzZTsKKworCSp0eXBlID0gKHUzMilyZWdzX3B0 cltSVl9FWFRSQUNUX1JTMV9SRUcoaW5zbildOworCisJaWYgKGdldF9rZXJuZWxfbm9mYXVsdChp bnNuLCAodm9pZCAqKXJlZ3MtPmVwYykgfHwKKwkgICAgZ2V0X2tlcm5lbF9ub2ZhdWx0KGluc24s ICh2b2lkICopcmVncy0+ZXBjICsgR0VUX0lOU05fTEVOR1RIKGluc24pKSkKKwkJcmV0dXJuIGZh bHNlOworCisJaWYgKHJpc2N2X2luc25faXNfamFscihpbnNuKSkKKwkJcnMxX251bSA9IFJWX0VY VFJBQ1RfUlMxX1JFRyhpbnNuKTsKKwllbHNlIGlmIChyaXNjdl9pbnNuX2lzX2NfamFscihpbnNu KSkKKwkJcnMxX251bSA9IFJWQ19FWFRSQUNUX0MyX1JTMV9SRUcoaW5zbik7CisJZWxzZQorCQly ZXR1cm4gZmFsc2U7CisKKwkqdGFyZ2V0ID0gcmVnc19wdHJbcnMxX251bV07CisKKwlyZXR1cm4g dHJ1ZTsKK30KKworLyoKKyAqIENoZWNrcyBpZiB0aGUgZWJyZWFrIHRyYXAgaXMgYmVjYXVzZSBv ZiBhIENGSSBmYWlsdXJlLCBhbmQgaGFuZGxlcyB0aGUgdHJhcAorICogaWYgbmVlZGVkLiBSZXR1 cm5zIGEgYnVnX3RyYXBfdHlwZSB2YWx1ZSBzaW1pbGFybHkgdG8gcmVwb3J0X2J1Zy4KKyAqLwor ZW51bSBidWdfdHJhcF90eXBlIGhhbmRsZV9jZmlfZmFpbHVyZShzdHJ1Y3QgcHRfcmVncyAqcmVn cykKK3sKKwl1bnNpZ25lZCBsb25nIHRhcmdldDsKKwl1MzIgdHlwZTsKKworCWlmICghaXNfY2Zp X3RyYXAocmVncy0+ZXBjKSkKKwkJcmV0dXJuIEJVR19UUkFQX1RZUEVfTk9ORTsKKworCWlmICgh ZGVjb2RlX2NmaV9pbnNuKHJlZ3MsICZ0YXJnZXQsICZ0eXBlKSkKKwkJcmV0dXJuIHJlcG9ydF9j ZmlfZmFpbHVyZV9ub2FkZHIocmVncywgcmVncy0+ZXBjKTsKKworCXJldHVybiByZXBvcnRfY2Zp X2ZhaWx1cmUocmVncywgcmVncy0+ZXBjLCAmdGFyZ2V0LCB0eXBlKTsKK30KZGlmZiAtLWdpdCBh L2FyY2gvcmlzY3Yva2VybmVsL3RyYXBzLmMgYi9hcmNoL3Jpc2N2L2tlcm5lbC90cmFwcy5jCmlu ZGV4IDhjMjU4Yjc4YzkyNS4uMzlkY2UwMGM2ZWQ3IDEwMDY0NAotLS0gYS9hcmNoL3Jpc2N2L2tl cm5lbC90cmFwcy5jCisrKyBiL2FyY2gvcmlzY3Yva2VybmVsL3RyYXBzLmMKQEAgLTIxLDYgKzIx LDcgQEAKIAogI2luY2x1ZGUgPGFzbS9hc20tcHJvdG90eXBlcy5oPgogI2luY2x1ZGUgPGFzbS9i dWcuaD4KKyNpbmNsdWRlIDxhc20vY2ZpLmg+CiAjaW5jbHVkZSA8YXNtL2Nzci5oPgogI2luY2x1 ZGUgPGFzbS9wcm9jZXNzb3IuaD4KICNpbmNsdWRlIDxhc20vcHRyYWNlLmg+CkBAIC0yNDIsNyAr MjQzLDggQEAgdm9pZCBoYW5kbGVfYnJlYWsoc3RydWN0IHB0X3JlZ3MgKnJlZ3MpCiAJCQkJCQkJ CT09IE5PVElGWV9TVE9QKQogCQlyZXR1cm47CiAjZW5kaWYKLQllbHNlIGlmIChyZXBvcnRfYnVn KHJlZ3MtPmVwYywgcmVncykgPT0gQlVHX1RSQVBfVFlQRV9XQVJOKQorCWVsc2UgaWYgKHJlcG9y dF9idWcocmVncy0+ZXBjLCByZWdzKSA9PSBCVUdfVFJBUF9UWVBFX1dBUk4gfHwKKwkJIGhhbmRs ZV9jZmlfZmFpbHVyZShyZWdzKSA9PSBCVUdfVFJBUF9UWVBFX1dBUk4pCiAJCXJlZ3MtPmVwYyAr PSBnZXRfYnJlYWtfaW5zbl9sZW5ndGgocmVncy0+ZXBjKTsKIAllbHNlCiAJCWRpZShyZWdzLCAi S2VybmVsIEJVRyIpOwotLSAKMi40MS4wLjI1NS5nOGIxZDA3MWM1MC1nb29nCgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtcmlzY3YgbWFpbGlu ZyBsaXN0CmxpbnV4LXJpc2N2QGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJh ZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1yaXNjdgo= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BDB41078E for ; Thu, 29 Jun 2023 23:42:57 +0000 (UTC) Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-66a634b2cf5so852009b3a.0 for ; Thu, 29 Jun 2023 16:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1688082177; x=1690674177; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=kH7bkPbO18xX/Wp0GpqGpLlOQ0f95hD6FnRtLDJvT1U=; b=MOrJxSP3sVqGm+w0js/kIw42CYZEUP0oOJNMS+uIOa3MELAjgpbyTEzy/4B24ur+OK qM7qAuosF6u0oM27xEmeVggBJ+6/NH+9EoAVMOBltCUDX8waMif7DUAE8zgVrP066VKz JZYmWrGCxkCV1ew5vNDDksZ/wRF/Zoujs622lDGtfKg6dUgwqu1Buhk5NRH1fTLjNmt8 NUyWcokBJNyaKD+b76OJOILtSe24hjIImin9Dzgx3z7SSWX+3BpmVK9w1Ah3TO1Ekw6T q0BczkHxDyFoQVa4T2Ls121wOtYzOA/qMkqb3C89vnQyR85YIGae/1Kwcla942IWNnDu AXTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688082177; x=1690674177; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=kH7bkPbO18xX/Wp0GpqGpLlOQ0f95hD6FnRtLDJvT1U=; b=kT1bsL39mnZxz8QwGwz6n47VU0Jm8B1sR5GJPpjZpEA9LD8RBeskxQ1FpjuwE3zG/x Z/fIoOEvz8ZPLQHPPdfceidee0XvyhA2bM4oAKeOD1kktCWCrr1oyQ4zENBhJQZfNJag jEAxTkINw5MY++12yPWom+TLR5fhOpSwCjFX7uDrWh/cQbHZgcRm+RB0b0PDaVZKhNXC jxi7pP+AbGdlY7BraFlXW/0s0TNnMnTnrdZ92gTtKGOBJbGdh/1jwKqOUuUePt0Zkop5 UYEvdYLcjlQpVeMEPyebA2qa8hWPoMX6l5Mpb91tiuj0tbsYe3J0KdQ8CpG14Ldqziee FnQQ== X-Gm-Message-State: AC+VfDzcpww8XsFpdDaKJ8j0+3qO+k9yvcS/RjkoZ5vfUNa2r84mWz3N rW4UhrRC8+kPTEXekiAFnuzXg0ZhGUNgkeAW3Fw= X-Google-Smtp-Source: ACHHUZ54tMcYLAqtFQ4eD7Co9823u9Z85Yql+d2HDqherGgBCI4z4EkToq8lC91y+5fbCwaKDbVpEDDVYz5UAdJejDo= X-Received: from samitolvanen.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:4f92]) (user=samitolvanen job=sendgmr) by 2002:a05:6a00:18a6:b0:67b:8602:aa10 with SMTP id x38-20020a056a0018a600b0067b8602aa10mr1871084pfh.0.1688082176944; Thu, 29 Jun 2023 16:42:56 -0700 (PDT) Date: Thu, 29 Jun 2023 23:42:49 +0000 In-Reply-To: <20230629234244.1752366-8-samitolvanen@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230629234244.1752366-8-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=9436; i=samitolvanen@google.com; h=from:subject; bh=JZNR4FrhRgjhD3OE65/zHFRoFa/eW0jA8NKJ4VpUQAM=; b=owEB7QES/pANAwAKAUy19oSLvFbuAcsmYgBknhb17pDdOWUqLhJ1JUH+3wVLRO6EhFWeGwkjK 7BieuQqsc+JAbMEAAEKAB0WIQQ1zPtjsoPW0663g5RMtfaEi7xW7gUCZJ4W9QAKCRBMtfaEi7xW 7rBdC/9osT4E49rQweMxnUcqovViVIiMB+HeQOW+PQuZH8/EBALEW5KQD2WoZyN/to24b+CwgXK b1rrMZ+HQQlfYYiWdS8D1o3sa2GYK6f8koSaggQIj2kVFoNzOuYnLt5xGZBifcfUPONMLMaYZTf mlqJvD5HFVi6h4Qxs5ldTItdrbjOaLz/T4eTqRVHaQOkhd2rJgu+WAgJbOngaGxxtR70yikAiCf W0pw2m8Pwk1v7zso9VmFhwmvof8W6Xnu4bG+knxaOu/U7ih2C0X/PQNHEOXbF7W9mUdrDUbGqtU giHYTQDuORwbMfrlmL3LPs5lGweV3g2tiILj+obadtUVNSm4vVna8O6+bn7Jlke3doKZwCV6rYU nHzSfo1wvr5CVp+Ky0bLf3DY0QkL+ovuUbM1c5nRG3XxnKHXAUK25nrPmlq/z5ielGMqymHg7bC /GU8cbvrTijynsfGXpREBVxgFz5cPMaL4FG69n8bEaCVytbhhs/hrmLGwI0pno1dRpW4Y= X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230629234244.1752366-12-samitolvanen@google.com> Subject: [PATCH 4/6] riscv: Add CFI error handling From: Sami Tolvanen To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Kees Cook Cc: Nathan Chancellor , Nick Desaulniers , linux-riscv@lists.infradead.org, llvm@lists.linux.dev, linux-kernel@vger.kernel.org, Sami Tolvanen Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 : ff20000000= 453cf0 [ 21.180792] gp : ffffffff81308c38 tp : ff6000000243f080 t0 : ff20000000= 453b78 [ 21.181157] t1 : 000000003ad55aca t2 : 000000007e0c52a5 s0 : ff20000000= 453d00 [ 21.181506] s1 : 0000000000000001 a0 : ffffffff0138d170 a1 : ffffffff01= 3870bc [ 21.181819] a2 : b5fea48dd89aa700 a3 : 0000000000000001 a4 : 0000000000= 000fff [ 21.182169] a5 : 0000000000000004 a6 : 00000000000000b7 a7 : 0000000000= 000000 [ 21.182591] s2 : ff20000000453e78 s3 : ffffffffffffffea s4 : 0000000000= 000012 [ 21.183001] s5 : ff600000023c7000 s6 : 0000000000000006 s7 : ffffffff01= 3882a0 [ 21.183653] s8 : 0000000000000008 s9 : 0000000000000002 s10: ffffffff01= 38d878 [ 21.184245] s11: ffffffff0138d878 t3 : 0000000000000003 t4 : 0000000000= 000000 [ 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 [lkdt= m] [ 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 (900= 2) 9582 [ 21.189178] ---[ end trace 0000000000000000 ]--- [ 21.189590] Kernel panic - not syncing: Fatal exception Signed-off-by: Sami Tolvanen --- 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 b54a830eb5c6..20a40927175e 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -44,6 +44,7 @@ config RISCV select ARCH_SUPPORTS_DEBUG_PAGEALLOC if MMU select ARCH_SUPPORTS_HUGETLBFS if MMU select ARCH_SUPPORTS_PAGE_TABLE_CHECK if MMU + select ARCH_USES_CFI_TRAPS if CFI_CLANG select ARCH_USE_MEMTEST select ARCH_USE_QUEUED_RWLOCKS select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU diff --git a/arch/riscv/include/asm/cfi.h b/arch/riscv/include/asm/cfi.h new file mode 100644 index 000000000000..56bf9d69d5e3 --- /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 8d5c84f2d5ef..45bc485fcf3f 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) =20 /* The bit field of immediate value in RVC J instruction */ @@ -129,6 +130,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) =20 /* parts of opcode for RVG*/ #define RVG_OPCODE_FENCE 0x0f @@ -258,6 +260,10 @@ static __always_inline bool riscv_insn_is_branch(u32 c= ode) #define RV_X(X, s, mask) (((X) >> (s)) & (mask)) #define RVC_X(X, s, mask) RV_X(X, s, mask) =20 +#define RV_EXTRACT_RS1_REG(x) \ + ({typeof(x) x_ =3D (x); \ + (RV_X(x_, RVG_RS1_OPOFF, RVG_RS1_MASK)); }) + #define RV_EXTRACT_RD_REG(x) \ ({typeof(x) x_ =3D (x); \ (RV_X(x_, RVG_RD_OPOFF, RVG_RD_MASK)); }) @@ -285,6 +291,10 @@ static __always_inline bool riscv_insn_is_branch(u32 c= ode) (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); }) =20 +#define RVC_EXTRACT_C2_RS1_REG(x) \ + ({typeof(x) x_ =3D (x); \ + (RV_X(x_, RVC_C2_RS1_OPOFF, RVC_C2_RS1_MASK)); }) + #define RVC_EXTRACT_JTYPE_IMM(x) \ ({typeof(x) x_ =3D (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 153864e4f399..c173a7cbf4e1 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -90,6 +90,8 @@ obj-$(CONFIG_CRASH_CORE) +=3D crash_core.o =20 obj-$(CONFIG_JUMP_LABEL) +=3D jump_label.o =20 +obj-$(CONFIG_CFI_CLANG) +=3D cfi.o + obj-$(CONFIG_EFI) +=3D efi.o obj-$(CONFIG_COMPAT) +=3D compat_syscall_table.o obj-$(CONFIG_COMPAT) +=3D compat_signal.o diff --git a/arch/riscv/kernel/cfi.c b/arch/riscv/kernel/cfi.c new file mode 100644 index 000000000000..820158d7a291 --- /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 =3D (unsigned long *)regs; + int rs1_num; + u32 insn; + + *target =3D *type =3D 0; + + /* + * The compiler generates the following instruction sequence + * for indirect call checks: + * + * =C2=A0 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 =3D (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 =3D RV_EXTRACT_RS1_REG(insn); + else if (riscv_insn_is_c_jalr(insn)) + rs1_num =3D RVC_EXTRACT_C2_RS1_REG(insn); + else + return false; + + *target =3D 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 8c258b78c925..39dce00c6ed7 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -21,6 +21,7 @@ =20 #include #include +#include #include #include #include @@ -242,7 +243,8 @@ void handle_break(struct pt_regs *regs) =3D=3D NOTIFY_STOP) return; #endif - else if (report_bug(regs->epc, regs) =3D=3D BUG_TRAP_TYPE_WARN) + else if (report_bug(regs->epc, regs) =3D=3D BUG_TRAP_TYPE_WARN || + handle_cfi_failure(regs) =3D=3D BUG_TRAP_TYPE_WARN) regs->epc +=3D get_break_insn_length(regs->epc); else die(regs, "Kernel BUG"); --=20 2.41.0.255.g8b1d071c50-goog