Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp118754ybx; Tue, 5 Nov 2019 20:49:09 -0800 (PST) X-Google-Smtp-Source: APXvYqxf7th9tgaTcy705qyEgmODWcIzMKJYfUMyzYwfvfe5r10iM4IYLiJnRsuTri36kGSBWmqq X-Received: by 2002:a17:906:6d4f:: with SMTP id a15mr12186983ejt.175.1573015749780; Tue, 05 Nov 2019 20:49:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573015749; cv=none; d=google.com; s=arc-20160816; b=kjW4EPgRRlDNv8VJ6eZ58wDHUYKPa118EOXw8GgFdcRY1lxn9YuoutXlK2H4j6BpSC LFpi041EPRTLlZt1E5KY0NlErgrCPZG6ssuSFzg/3HzN3imAbnq7+46ZvH1s3ec+nYW1 RfMvm1Ftuj9GAO9K6eM62A5RInlCsQXlJjt43ZRm5nF5zpmurXY+Mpbi3Uq+qqmrKlNL 49taMmsjPRM+aD3ZsAuvNAzwskDCWd5ZriJ51wFAJCBW/iLommn044TOdRRLZ0VzNIrw I9w/nAWW7TD6ZqGBpT++GsEhSkJ6aoe1/jz2q/FskWCDm1GNs1zv03/UtNz5UiutCzAg 7rAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=gJMPHhKHFX8udqWNx4esBxs7+6CjmiT3KwNBEYCiDu4=; b=ZrLIRPfQFirLiJYuruHxWkZz6sg0fwOkHvgcJ6OBHX+I7UmxQr013Ett/71KR6o68d ZgfRBql5NWtI/x2kIbwlP7LwAZvHD9uPQxhp2OFAjX7I/tm2QqbKj3HThbLJrqT2POP9 KNraIL2iNtsx3awV6cvIPqczo88LBh07bq7JMtBzmY0L+Jm83liynnc4UoW5GJELAuRk xHlqWxPyNiLyln9PQ9ZBGO9EcB9cKvoMt1woDRzJsPGoPuf2VdGeDxSxu2UAf31bKUka kJsWTB9PH+gkCOM25SzhF65GdnE86I1FML0HpOTeQKaF5JzBWOItUCtwlK7pH9R/8+wd ofeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=AGaoiWuH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m11si5486584ejr.225.2019.11.05.20.48.46; Tue, 05 Nov 2019 20:49:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=AGaoiWuH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731272AbfKFEqC (ORCPT + 99 others); Tue, 5 Nov 2019 23:46:02 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:39772 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729303AbfKFEqC (ORCPT ); Tue, 5 Nov 2019 23:46:02 -0500 Received: by mail-lj1-f194.google.com with SMTP id p18so1128987ljc.6 for ; Tue, 05 Nov 2019 20:46:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=gJMPHhKHFX8udqWNx4esBxs7+6CjmiT3KwNBEYCiDu4=; b=AGaoiWuH4Fsah/5Mrnysi1CUGLJA95+VACk5fohzuSyNRGRqjFWx/bzNkkjPzfXmn4 Y56Mfrcr6KlRajYlG8J7KWJAzdar9H1F0kQSjY+NkGPXkylSOBzxNGc8EYAurRfcmB6W 43XMW6wWO+KuWZ1x2OgcbRKsHTZipTg9iq1cqcSeYN66xeR7uy8Njsi51KVfJz+5ptjW 6D0z5JCz3b+KpM0c+b+GyEa3DW++SaLoFMLmFNX+jRCwBR7lqHsH0/t1F5oUENfxCUfW SzqAF/JT6aUsvr6p7H9ff6QpT6lsCCcdg5dNgHRCLTaRIyLqKDptL5tfjfXLbtrBDfPD 2HNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=gJMPHhKHFX8udqWNx4esBxs7+6CjmiT3KwNBEYCiDu4=; b=h02FihivnopCpa3BVO4ves2HQcN+Vbb0EO+y09dZoexvVirT1SYwMf/ZaJdNEHtPaI wgjw5C4FHEeitpfGOtvMvdUA2/q72LIgKzWu2ZgbmZK7XlwASJsQzmqz7lNNTA/wqWC9 4KioulNTK/Q2Xm2MJkud1XYFV4E/TeRQSpIiJhZ1dKP0Ih34URcezsczQDr/pwEOuRqZ NRgxMshsiwAb9W1nGspvofJhAtvrBf315YFFwyOKpw0cdDODNvf88cxTn5yczJaq8jlX 2WBnHb9VR2JT1RTIJG0u2NPKdA65+iHa4Eaud/p4ezPaOwCyGgY27bwhs1FTFzDcHHAU B5gw== X-Gm-Message-State: APjAAAW92Fxj2cEN8sf2QL1TZ3TaDQ0RVUDAgf3109w99etRuoQjumS0 FgxTrFg+0MadBwy3w/eoyYOkIYPX7UHxu4dyfdQ= X-Received: by 2002:a2e:2419:: with SMTP id k25mr252654ljk.59.1573015560588; Tue, 05 Nov 2019 20:46:00 -0800 (PST) MIME-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> <20191105235608.107702-1-samitolvanen@google.com> <20191105235608.107702-12-samitolvanen@google.com> In-Reply-To: <20191105235608.107702-12-samitolvanen@google.com> From: Miguel Ojeda Date: Wed, 6 Nov 2019 05:45:49 +0100 Message-ID: Subject: Re: [PATCH v5 11/14] arm64: efi: restore x18 if it was corrupted To: Sami Tolvanen Cc: Will Deacon , Catalin Marinas , Steven Rostedt , Masami Hiramatsu , Ard Biesheuvel , Dave Martin , Kees Cook , Laura Abbott , Mark Rutland , Marc Zyngier , Nick Desaulniers , Jann Horn , Masahiro Yamada , clang-built-linux , Kernel Hardening , Linux ARM , linux-kernel Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 6, 2019 at 12:56 AM Sami Tolvanen wrote: > > If we detect a corrupted x18 and SCS is enabled, restore the register > before jumping back to instrumented code. This is safe, because the > wrapper is called with preemption disabled and a separate shadow stack > is used for interrupt handling. In case you do v6: I think putting the explanation about why this is safe in the existing comment would be best given it is justifying a subtlety of the code rather than the change itself. Ard? Cheers, Miguel