From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (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 C33971869 for ; Fri, 29 Apr 2022 20:37:38 +0000 (UTC) Received: by mail-yb1-f201.google.com with SMTP id b6-20020a5b0b46000000b006457d921729so8368410ybr.23 for ; Fri, 29 Apr 2022 13:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=CBFSOSCWmXZdYTn8wlTZ3Rj5NSKYEySXgB9hFZpDWcQ=; b=ZMe9V/MSuwf8udmciH8lqoba83OKO8v0g4K1vzIlxr2talii7K7Ys0ordrrMAHe+pp DaqLObTTros84C3FoilHwVOlv/STu0KhGjugyeK349pAgMRnv4wFfKGXK66cTNEK/E/2 9CS4D6qXyibLUANPFQftw9xg5fy6QMtOA2/GCKenixGS3WyJxUkAAE2Fomn5XE4N6+Fu MH4isN9/BTjRcs0gsnSNZkRVTC/M1BBUGL5BQ+8ljr9lJua+F/PodDy+y3v9FvpxQypS cIBtMTLJxrS2yefnyXe+cpHCAo5gcyjEL1MfDZsZasLEWiGX5qs2r02D/2wLWwBVNFNQ E5nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=CBFSOSCWmXZdYTn8wlTZ3Rj5NSKYEySXgB9hFZpDWcQ=; b=57sQpOammaU46zBdC0rg6T246UY8+leJIHw8BUjjdKm44Ns3VvQS6soWA6dcvrc3Js 5kYOYZpUHFJfbFIzeQ6YgiKCrcA8OnXntCA3XaqzXas4pZt3O/LaivIwBkF8os4SSCai tpdZRpm/J1ZE+O0uDM3fEhKAB2wtl/vqrTr+RLVPJaAnI458AJCj0sCSFgk8wJ+xy0Te i1bHFtPABKbChgvL+v0fEVnlwZ6Tmd31fZTO61TQ6CKUF5TC4PuSPKuk67IzogwUtMM5 QBz3zt3++WjjUS6JhFef50Swo+3QimOTkwjRMYIN6Q9ka9hnqQ7qOt3QCbmj7nLSaYii reMw== X-Gm-Message-State: AOAM530tDos2Simqn4CiPIqbmP4xpmtMn6swLkOFflNyPPpwAzz+AzKT fDdoH7kyw0rtYClhCU+XfqlTr+t3f5JXoYXpRaE= X-Google-Smtp-Source: ABdhPJz3PRZnRDaYveY8PEOrWLh5TwRRZFIgz/hxn66OLDYa/VrKRiT3aho8JsA1WKfUtkL1urGOjyBFCiYVRzF+Yvc= X-Received: from samitolvanen1.mtv.corp.google.com ([2620:15c:201:2:351:bea9:f158:1021]) (user=samitolvanen job=sendgmr) by 2002:a25:e0d3:0:b0:645:77c9:4e31 with SMTP id x202-20020a25e0d3000000b0064577c94e31mr1243653ybg.97.1651264657838; Fri, 29 Apr 2022 13:37:37 -0700 (PDT) Date: Fri, 29 Apr 2022 13:36:44 -0700 In-Reply-To: <20220429203644.2868448-1-samitolvanen@google.com> Message-Id: <20220429203644.2868448-22-samitolvanen@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20220429203644.2868448-1-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=3169; h=from:subject; bh=uFL18k3KC4iCKF4AXgGD1Mq4jj5gai1wigbzvC9PP/o=; b=owEB7QES/pANAwAKAUy19oSLvFbuAcsmYgBibExY2LifXNevk1TsxQ0IeoobF4r0E0uMXfS+2IhA yLd8T56JAbMEAAEKAB0WIQQ1zPtjsoPW0663g5RMtfaEi7xW7gUCYmxMWAAKCRBMtfaEi7xW7ou7DA CVtuVd3sKEK3z2ChoeiIcGcU8iukBN8OM/HXmzh3pZq6yVg67wrrJiJ5oCCKPR2sRaYP0t6MSn772K l5U4p82O/prDh9AK0kKeyaSy4kvxVMyegTBCTiWzEC3tN48aXVcmI3dMp98RL7LGQzu9v4CLIEVaAa ZyLplEa810jUrIxOZER6sZfDmqUN7V/0ZKKzwsynPVXj76wvte6NCWe3NJ/ZxHTKwz2evdYtezNBOs w5UmruzJ3X4BM+NXqEmVZVfauFH9okVc4aHyl3C0tSJ4hQddWslVlW6jiD7FczG0DVtfhYaktcY3yZ 335Ly2E9sGHsooiWLotHkG2PgPaJ+Jhfa2cw8T3990e55MXFQKaNXNTCRXA+Qq5C7qXBuPFrmbgIz1 isZNNgIYvj+7LUjbO4NBInJYbyLkQMpgNLLqoZq/7hfv1xoJcIZg4CS+1iAmr+3dOxn1GAj/d/7CTi jKj9QZzAlA88rYhDAQ3LbORG2j6VAUCtSo+oWCun3pPF8= X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog Subject: [RFC PATCH 21/21] x86: Add support for CONFIG_CFI_CLANG From: Sami Tolvanen To: linux-kernel@vger.kernel.org Cc: Kees Cook , Josh Poimboeuf , Peter Zijlstra , x86@kernel.org, Catalin Marinas , Will Deacon , Mark Rutland , Nathan Chancellor , Nick Desaulniers , Joao Moreira , Sedat Dilek , Steven Rostedt , linux-hardening@vger.kernel.org, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev, Sami Tolvanen Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Add CONFIG_CFI_CLANG error handling and allow the config to be selected on x86_64. Signed-off-by: Sami Tolvanen --- arch/x86/Kconfig | 1 + arch/x86/include/asm/linkage.h | 7 ++++++ arch/x86/kernel/traps.c | 39 +++++++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b0142e01002e..01db5c5c4dde 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -108,6 +108,7 @@ config X86 select ARCH_SUPPORTS_PAGE_TABLE_CHECK if X86_64 select ARCH_SUPPORTS_NUMA_BALANCING if X86_64 select ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP if NR_CPUS <=3D 4096 + select ARCH_SUPPORTS_CFI_CLANG if X86_64 select ARCH_SUPPORTS_LTO_CLANG select ARCH_SUPPORTS_LTO_CLANG_THIN select ARCH_USE_BUILTIN_BSWAP diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.= h index 85865f1645bd..d20acf5ebae3 100644 --- a/arch/x86/include/asm/linkage.h +++ b/arch/x86/include/asm/linkage.h @@ -25,6 +25,13 @@ #define RET ret #endif =20 +#ifdef CONFIG_CFI_CLANG +#define __CFI_TYPE(name) \ + .fill 10, 1, 0x90 ASM_NL \ + .4byte __kcfi_typeid_##name ASM_NL \ + .fill 2, 1, 0xcc +#endif + #else /* __ASSEMBLY__ */ =20 #ifdef CONFIG_SLS diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 1563fb995005..b9e46e6ed83b 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -40,6 +40,7 @@ #include #include #include +#include =20 #include #include @@ -295,6 +296,41 @@ static inline void handle_invalid_op(struct pt_regs *r= egs) ILL_ILLOPN, error_get_trap_addr(regs)); } =20 +#ifdef CONFIG_CFI_CLANG +void *arch_get_cfi_target(unsigned long addr, struct pt_regs *regs) +{ + char buffer[MAX_INSN_SIZE]; + int offset; + struct insn insn; + unsigned long *target; + + /* + * The expected CFI check instruction sequence: + * =C2=A0 cmpl=C2=A0 =C2=A0 , -6(%reg) ; 7 bytes + * je .Ltmp1 ; 2 bytes + * ud2 ; <- addr + * .Ltmp1: + * + * Therefore, the target address is in a register that we can + * decode from the cmpl instruction. + */ + if (copy_from_kernel_nofault(buffer, (void *)addr - 9, MAX_INSN_SIZE)) + return NULL; + if (insn_decode(&insn, buffer, MAX_INSN_SIZE, INSN_MODE_64)) + return NULL; + if (insn.opcode.value !=3D 0x81) + return NULL; + + offset =3D insn_get_modrm_rm_off(&insn, regs); + if (offset < 0) + return NULL; + + target =3D (void *)regs + offset; + + return (void *)*target; +} +#endif + static noinstr bool handle_bug(struct pt_regs *regs) { bool handled =3D false; @@ -312,7 +348,8 @@ static noinstr bool handle_bug(struct pt_regs *regs) */ if (regs->flags & X86_EFLAGS_IF) raw_local_irq_enable(); - if (report_bug(regs->ip, regs) =3D=3D BUG_TRAP_TYPE_WARN) { + if (report_bug(regs->ip, regs) =3D=3D BUG_TRAP_TYPE_WARN || + report_cfi(regs->ip, regs) =3D=3D BUG_TRAP_TYPE_WARN) { regs->ip +=3D LEN_UD2; handled =3D true; } --=20 2.36.0.464.gb9c8b46e94-goog 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 C1EA5C433F5 for ; Fri, 29 Apr 2022 20:55:06 +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:References: Mime-Version:Message-Id: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=Nrnb7lq9YJI+qXehuP5Y/VQZ9fD9gWQ3D1Lr5RJe4KI=; b=sUJlX83oFxlW6eeOCYJ4MOA5O0 lj4eKn5uO8XCMQ0D4BvHoVm2jq8MI1RQGR9GqI+HmWv7Tsq88cuyk5jDAWv0h5HHQND4QH40dEERJ zrvJOMFO4ckqyEfIpEPuC9Qbsj5e74KGETAy0pERxOqUtO3rxEbHd+FTgpE1/+69zOemx6CFWTjg1 HIJxWxPM+H5otAB3+OYZO1ia0Ut87GUBex8GPScY3mleCNwYMPM8lBARiuFVPA2yT4h4cRhEE046j d641ViCqokf38NYFaeB6PY5P1n3dyh7AI5+8AQ3GVMtvGisWPjMZYM5kdsz3V8xccBmwazFqjIkYE gluDsU6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nkXce-00Cd8Y-2A; Fri, 29 Apr 2022 20:53:53 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nkXMx-00CXUQ-GL for linux-arm-kernel@lists.infradead.org; Fri, 29 Apr 2022 20:37:42 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2f4dfd09d7fso84987697b3.0 for ; Fri, 29 Apr 2022 13:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=CBFSOSCWmXZdYTn8wlTZ3Rj5NSKYEySXgB9hFZpDWcQ=; b=ZMe9V/MSuwf8udmciH8lqoba83OKO8v0g4K1vzIlxr2talii7K7Ys0ordrrMAHe+pp DaqLObTTros84C3FoilHwVOlv/STu0KhGjugyeK349pAgMRnv4wFfKGXK66cTNEK/E/2 9CS4D6qXyibLUANPFQftw9xg5fy6QMtOA2/GCKenixGS3WyJxUkAAE2Fomn5XE4N6+Fu MH4isN9/BTjRcs0gsnSNZkRVTC/M1BBUGL5BQ+8ljr9lJua+F/PodDy+y3v9FvpxQypS cIBtMTLJxrS2yefnyXe+cpHCAo5gcyjEL1MfDZsZasLEWiGX5qs2r02D/2wLWwBVNFNQ E5nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=CBFSOSCWmXZdYTn8wlTZ3Rj5NSKYEySXgB9hFZpDWcQ=; b=7qcS/HcjJzlt0czKV1KK7mBmQGZanuTyD4XEQeTPz+xloJ209S7h7JZGnQbqIKjspI W9B+Y89zWnnK7/R6mwg0RGhUyUydrwI6F1cxw9uyBFBe5Mqk/m8DvH9sp5vmPV28Fdk4 ot9jHv8aAOqWkAj4HJTzhf7YzXDBkEWhofwJ79y9We5ultPozI80V9P7HmEJKN1eEenv GnjscjIpRwFjwcR+TEDdRttDRFP4e4MwUssEhsZNm+Fhq0kYZSrAPeSlDcGiS/YeqDmU ljByUq0JtXgrApYHm4mnyYQzndDjK88c2nNDdRAGF3WUXbO4dXrf7GH0Zvp7VkYNfcZC jLPQ== X-Gm-Message-State: AOAM532a0ibeClC29a5pR0LdHhqGJkFb9Y0yYIB+trShnvTZMIxDLDEI zZjm302MQwpNp0LN3M14cBpmxjFg59YTeOra+2I= X-Google-Smtp-Source: ABdhPJz3PRZnRDaYveY8PEOrWLh5TwRRZFIgz/hxn66OLDYa/VrKRiT3aho8JsA1WKfUtkL1urGOjyBFCiYVRzF+Yvc= X-Received: from samitolvanen1.mtv.corp.google.com ([2620:15c:201:2:351:bea9:f158:1021]) (user=samitolvanen job=sendgmr) by 2002:a25:e0d3:0:b0:645:77c9:4e31 with SMTP id x202-20020a25e0d3000000b0064577c94e31mr1243653ybg.97.1651264657838; Fri, 29 Apr 2022 13:37:37 -0700 (PDT) Date: Fri, 29 Apr 2022 13:36:44 -0700 In-Reply-To: <20220429203644.2868448-1-samitolvanen@google.com> Message-Id: <20220429203644.2868448-22-samitolvanen@google.com> Mime-Version: 1.0 References: <20220429203644.2868448-1-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=3169; h=from:subject; bh=uFL18k3KC4iCKF4AXgGD1Mq4jj5gai1wigbzvC9PP/o=; b=owEB7QES/pANAwAKAUy19oSLvFbuAcsmYgBibExY2LifXNevk1TsxQ0IeoobF4r0E0uMXfS+2IhA yLd8T56JAbMEAAEKAB0WIQQ1zPtjsoPW0663g5RMtfaEi7xW7gUCYmxMWAAKCRBMtfaEi7xW7ou7DA CVtuVd3sKEK3z2ChoeiIcGcU8iukBN8OM/HXmzh3pZq6yVg67wrrJiJ5oCCKPR2sRaYP0t6MSn772K l5U4p82O/prDh9AK0kKeyaSy4kvxVMyegTBCTiWzEC3tN48aXVcmI3dMp98RL7LGQzu9v4CLIEVaAa ZyLplEa810jUrIxOZER6sZfDmqUN7V/0ZKKzwsynPVXj76wvte6NCWe3NJ/ZxHTKwz2evdYtezNBOs w5UmruzJ3X4BM+NXqEmVZVfauFH9okVc4aHyl3C0tSJ4hQddWslVlW6jiD7FczG0DVtfhYaktcY3yZ 335Ly2E9sGHsooiWLotHkG2PgPaJ+Jhfa2cw8T3990e55MXFQKaNXNTCRXA+Qq5C7qXBuPFrmbgIz1 isZNNgIYvj+7LUjbO4NBInJYbyLkQMpgNLLqoZq/7hfv1xoJcIZg4CS+1iAmr+3dOxn1GAj/d/7CTi jKj9QZzAlA88rYhDAQ3LbORG2j6VAUCtSo+oWCun3pPF8= X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog Subject: [RFC PATCH 21/21] x86: Add support for CONFIG_CFI_CLANG From: Sami Tolvanen To: linux-kernel@vger.kernel.org Cc: Kees Cook , Josh Poimboeuf , Peter Zijlstra , x86@kernel.org, Catalin Marinas , Will Deacon , Mark Rutland , Nathan Chancellor , Nick Desaulniers , Joao Moreira , Sedat Dilek , Steven Rostedt , linux-hardening@vger.kernel.org, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev, Sami Tolvanen X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220429_133739_637961_5A518392 X-CRM114-Status: GOOD ( 16.97 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org QWRkIENPTkZJR19DRklfQ0xBTkcgZXJyb3IgaGFuZGxpbmcgYW5kIGFsbG93IHRoZSBjb25maWcg dG8gYmUgc2VsZWN0ZWQKb24geDg2XzY0LgoKU2lnbmVkLW9mZi1ieTogU2FtaSBUb2x2YW5lbiA8 c2FtaXRvbHZhbmVuQGdvb2dsZS5jb20+Ci0tLQogYXJjaC94ODYvS2NvbmZpZyAgICAgICAgICAg ICAgIHwgIDEgKwogYXJjaC94ODYvaW5jbHVkZS9hc20vbGlua2FnZS5oIHwgIDcgKysrKysrCiBh cmNoL3g4Ni9rZXJuZWwvdHJhcHMuYyAgICAgICAgfCAzOSArKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKystCiAzIGZpbGVzIGNoYW5nZWQsIDQ2IGluc2VydGlvbnMoKyksIDEgZGVsZXRp b24oLSkKCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9LY29uZmlnIGIvYXJjaC94ODYvS2NvbmZpZwpp bmRleCBiMDE0MmUwMTAwMmUuLjAxZGI1YzVjNGRkZSAxMDA2NDQKLS0tIGEvYXJjaC94ODYvS2Nv bmZpZworKysgYi9hcmNoL3g4Ni9LY29uZmlnCkBAIC0xMDgsNiArMTA4LDcgQEAgY29uZmlnIFg4 NgogCXNlbGVjdCBBUkNIX1NVUFBPUlRTX1BBR0VfVEFCTEVfQ0hFQ0sJaWYgWDg2XzY0CiAJc2Vs ZWN0IEFSQ0hfU1VQUE9SVFNfTlVNQV9CQUxBTkNJTkcJaWYgWDg2XzY0CiAJc2VsZWN0IEFSQ0hf U1VQUE9SVFNfS01BUF9MT0NBTF9GT1JDRV9NQVAJaWYgTlJfQ1BVUyA8PSA0MDk2CisJc2VsZWN0 IEFSQ0hfU1VQUE9SVFNfQ0ZJX0NMQU5HCQlpZiBYODZfNjQKIAlzZWxlY3QgQVJDSF9TVVBQT1JU U19MVE9fQ0xBTkcKIAlzZWxlY3QgQVJDSF9TVVBQT1JUU19MVE9fQ0xBTkdfVEhJTgogCXNlbGVj dCBBUkNIX1VTRV9CVUlMVElOX0JTV0FQCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9pbmNsdWRlL2Fz bS9saW5rYWdlLmggYi9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9saW5rYWdlLmgKaW5kZXggODU4NjVm MTY0NWJkLi5kMjBhY2Y1ZWJhZTMgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2luY2x1ZGUvYXNtL2xp bmthZ2UuaAorKysgYi9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9saW5rYWdlLmgKQEAgLTI1LDYgKzI1 LDEzIEBACiAjZGVmaW5lIFJFVAlyZXQKICNlbmRpZgogCisjaWZkZWYgQ09ORklHX0NGSV9DTEFO RworI2RlZmluZSBfX0NGSV9UWVBFKG5hbWUpCQkJXAorCS5maWxsIDEwLCAxLCAweDkwIEFTTV9O TAkJXAorCS40Ynl0ZSBfX2tjZmlfdHlwZWlkXyMjbmFtZSBBU01fTkwJXAorCS5maWxsIDIsIDEs IDB4Y2MKKyNlbmRpZgorCiAjZWxzZSAvKiBfX0FTU0VNQkxZX18gKi8KIAogI2lmZGVmIENPTkZJ R19TTFMKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC90cmFwcy5jIGIvYXJjaC94ODYva2Vy bmVsL3RyYXBzLmMKaW5kZXggMTU2M2ZiOTk1MDA1Li5iOWU0NmU2ZWQ4M2IgMTAwNjQ0Ci0tLSBh L2FyY2gveDg2L2tlcm5lbC90cmFwcy5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC90cmFwcy5jCkBA IC00MCw2ICs0MCw3IEBACiAjaW5jbHVkZSA8bGludXgvaGFyZGlycS5oPgogI2luY2x1ZGUgPGxp bnV4L2F0b21pYy5oPgogI2luY2x1ZGUgPGxpbnV4L2lvYXNpZC5oPgorI2luY2x1ZGUgPGxpbnV4 L2NmaS5oPgogCiAjaW5jbHVkZSA8YXNtL3N0YWNrdHJhY2UuaD4KICNpbmNsdWRlIDxhc20vcHJv Y2Vzc29yLmg+CkBAIC0yOTUsNiArMjk2LDQxIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBoYW5kbGVf aW52YWxpZF9vcChzdHJ1Y3QgcHRfcmVncyAqcmVncykKIAkJICAgICAgSUxMX0lMTE9QTiwgZXJy b3JfZ2V0X3RyYXBfYWRkcihyZWdzKSk7CiB9CiAKKyNpZmRlZiBDT05GSUdfQ0ZJX0NMQU5HCit2 b2lkICphcmNoX2dldF9jZmlfdGFyZ2V0KHVuc2lnbmVkIGxvbmcgYWRkciwgc3RydWN0IHB0X3Jl Z3MgKnJlZ3MpCit7CisJY2hhciBidWZmZXJbTUFYX0lOU05fU0laRV07CisJaW50IG9mZnNldDsK KwlzdHJ1Y3QgaW5zbiBpbnNuOworCXVuc2lnbmVkIGxvbmcgKnRhcmdldDsKKworCS8qCisJICog VGhlIGV4cGVjdGVkIENGSSBjaGVjayBpbnN0cnVjdGlvbiBzZXF1ZW5jZToKKwkgKiDCoCBjbXBs wqAgwqAgPGlkPiwgLTYoJXJlZykJOyA3IGJ5dGVzCisJICogICBqZSAgICAgIC5MdG1wMQkJOyAy IGJ5dGVzCisJICogICB1ZDIJCQk7IDwtIGFkZHIKKwkgKiAgIC5MdG1wMToKKwkgKgorCSAqIFRo ZXJlZm9yZSwgdGhlIHRhcmdldCBhZGRyZXNzIGlzIGluIGEgcmVnaXN0ZXIgdGhhdCB3ZSBjYW4K KwkgKiBkZWNvZGUgZnJvbSB0aGUgY21wbCBpbnN0cnVjdGlvbi4KKwkgKi8KKwlpZiAoY29weV9m cm9tX2tlcm5lbF9ub2ZhdWx0KGJ1ZmZlciwgKHZvaWQgKilhZGRyIC0gOSwgTUFYX0lOU05fU0la RSkpCisJCXJldHVybiBOVUxMOworCWlmIChpbnNuX2RlY29kZSgmaW5zbiwgYnVmZmVyLCBNQVhf SU5TTl9TSVpFLCBJTlNOX01PREVfNjQpKQorCQlyZXR1cm4gTlVMTDsKKwlpZiAoaW5zbi5vcGNv ZGUudmFsdWUgIT0gMHg4MSkKKwkJcmV0dXJuIE5VTEw7CisKKwlvZmZzZXQgPSBpbnNuX2dldF9t b2RybV9ybV9vZmYoJmluc24sIHJlZ3MpOworCWlmIChvZmZzZXQgPCAwKQorCQlyZXR1cm4gTlVM TDsKKworCXRhcmdldCA9ICh2b2lkICopcmVncyArIG9mZnNldDsKKworCXJldHVybiAodm9pZCAq KSp0YXJnZXQ7Cit9CisjZW5kaWYKKwogc3RhdGljIG5vaW5zdHIgYm9vbCBoYW5kbGVfYnVnKHN0 cnVjdCBwdF9yZWdzICpyZWdzKQogewogCWJvb2wgaGFuZGxlZCA9IGZhbHNlOwpAQCAtMzEyLDcg KzM0OCw4IEBAIHN0YXRpYyBub2luc3RyIGJvb2wgaGFuZGxlX2J1ZyhzdHJ1Y3QgcHRfcmVncyAq cmVncykKIAkgKi8KIAlpZiAocmVncy0+ZmxhZ3MgJiBYODZfRUZMQUdTX0lGKQogCQlyYXdfbG9j YWxfaXJxX2VuYWJsZSgpOwotCWlmIChyZXBvcnRfYnVnKHJlZ3MtPmlwLCByZWdzKSA9PSBCVUdf VFJBUF9UWVBFX1dBUk4pIHsKKwlpZiAocmVwb3J0X2J1ZyhyZWdzLT5pcCwgcmVncykgPT0gQlVH X1RSQVBfVFlQRV9XQVJOIHx8CisJICAgIHJlcG9ydF9jZmkocmVncy0+aXAsIHJlZ3MpID09IEJV R19UUkFQX1RZUEVfV0FSTikgewogCQlyZWdzLT5pcCArPSBMRU5fVUQyOwogCQloYW5kbGVkID0g dHJ1ZTsKIAl9Ci0tIAoyLjM2LjAuNDY0LmdiOWM4YjQ2ZTk0LWdvb2cKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxp bmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3Rz LmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==