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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38E1AC433FE for ; Mon, 3 Oct 2022 18:31:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE7DF6B0071; Mon, 3 Oct 2022 14:31:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B97066B0073; Mon, 3 Oct 2022 14:31:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9EA728E0001; Mon, 3 Oct 2022 14:31:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 8845F6B0071 for ; Mon, 3 Oct 2022 14:31:03 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 5B102120543 for ; Mon, 3 Oct 2022 18:31:03 +0000 (UTC) X-FDA: 79980480006.08.101D0C6 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf22.hostedemail.com (Postfix) with ESMTP id E2320C001A for ; Mon, 3 Oct 2022 18:31:02 +0000 (UTC) Received: by mail-pl1-f178.google.com with SMTP id f21so2588144plb.13 for ; Mon, 03 Oct 2022 11:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date; bh=yWFb7RgESUpR05JgfY3hGQPjFfcU1x/EUhBNi7FjnRo=; b=PheLfVQNZdvrd76w9fTEkeWjqZZ7/2eEa6fQ0EZZSMfVfQPgF+/CqIcflCzBBHUFpw itUFINwrcHRurA8ZI8pf9m7E8cFXP7Qi00SMBeUYc0qkUTk+BhxAbx/wB1yEkS+j8nGw IzJhH5y7YxjK1FQ3v2cmRb2f3dqi1djliUovc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=yWFb7RgESUpR05JgfY3hGQPjFfcU1x/EUhBNi7FjnRo=; b=MwhnJrTBWollrnycAj8n7ZGcqMKOtNnQxFeLU+Ej+d1aFs8+RN7gA35e9lm3zDIZ2F hX7OnkhlUSzfGbjFVCmK3IrNgauBkqnSo5a5HmjgnC2U4YiBQSCBYzS6R0wPiaVBQLQ2 RSvA70ARFOp8WqY6f2KAMDNdRN5kXe0LqurPe1G+vUxA2DKR1v0PSus6yoKLT1CVzQxy xJLbz2/lSR2p34dmMAoJgl9fHIaztt6SFIivmV49tXtcpeM3nNBdRmSfWlshBmvdpgQT +MP7JzzAlvhkU8VRQJ1JKzobff5e9Zc6dD2aRI5tqGNcNAaDs3Oar/TmTNPA407uHN/6 pqpw== X-Gm-Message-State: ACrzQf3NyD10Tq9ysoQw7+V7XcL7AJRojgd3WjymKMkvi9UXc+11noNV 3ROIOaAtYwT5W/I5OcL86tFA1A== X-Google-Smtp-Source: AMsMyM7uo5Tzw/2Wd31Jjw44SLZYLBYBBrjxbdxXYvJpm9EoFdqt2quPyfPmA35slsvVMZOnqpgYmA== X-Received: by 2002:a17:90b:4ad1:b0:20a:b974:19a0 with SMTP id mh17-20020a17090b4ad100b0020ab97419a0mr3479373pjb.178.1664821861874; Mon, 03 Oct 2022 11:31:01 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id m7-20020a170902bb8700b0017bdfbfcf8dsm7500560pls.63.2022.10.03.11.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 11:31:00 -0700 (PDT) Date: Mon, 3 Oct 2022 11:30:59 -0700 From: Kees Cook To: Rick Edgecombe Cc: x86@kernel.org, "H . Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H . J . Lu" , Jann Horn , Jonathan Corbet , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V . Shankar" , Weijiang Yang , "Kirill A . Shutemov" , joao.moreira@intel.com, John Allen , kcc@google.com, eranian@google.com, rppt@kernel.org, jamorris@linux.microsoft.com, dethoma@microsoft.com, Yu-cheng Yu Subject: Re: [PATCH v2 18/39] mm: Add guard pages around a shadow stack. Message-ID: <202210031127.C6CF796@keescook> References: <20220929222936.14584-1-rick.p.edgecombe@intel.com> <20220929222936.14584-19-rick.p.edgecombe@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220929222936.14584-19-rick.p.edgecombe@intel.com> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664821863; a=rsa-sha256; cv=none; b=HjCVxCYMeN0Fh7dfTJ9aYYkc7mdIQfqfoXz/pQNnNBgHDH5sMegeKNkwPMkLRnFQleWFqx ebeoAGrlpEp63iJG/b4HH+PWQNBWD88JtCkjU6G6veRdpq1csu3m/kggBfALxHelTeRym9 ByJjNh3YMkAyfg+gN+Rc9HBx5rsW7P4= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=PheLfVQN; spf=pass (imf22.hostedemail.com: domain of keescook@chromium.org designates 209.85.214.178 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664821863; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=yWFb7RgESUpR05JgfY3hGQPjFfcU1x/EUhBNi7FjnRo=; b=4jNlkwLmjLtZxjpY1d40pCSgHBTZVRcyAZHu17zRtmsbSScUwt4Sw2hbZGZwGgYmk2dJAQ vu554eaZWqQq3h+a7I7trTulPLbvV+X/YSPD+FtvNFgtSh0qKoopo+DgE9or7rmicjdBaX ncl6q9T+UDdxw5eufLxidtV23kxaE9A= X-Rspamd-Server: rspam08 X-Rspam-User: X-Rspamd-Queue-Id: E2320C001A Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=PheLfVQN; spf=pass (imf22.hostedemail.com: domain of keescook@chromium.org designates 209.85.214.178 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Stat-Signature: zjab7jp7qxoxyktct9ppa4r7dmgirxpp X-HE-Tag: 1664821862-719688 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, Sep 29, 2022 at 03:29:15PM -0700, Rick Edgecombe wrote: > [...] > +unsigned long stack_guard_start_gap(struct vm_area_struct *vma) > +{ > + if (vma->vm_flags & VM_GROWSDOWN) > + return stack_guard_gap; > + > + /* > + * Shadow stack pointer is moved by CALL, RET, and INCSSP(Q/D). > + * INCSSPQ moves shadow stack pointer up to 255 * 8 = ~2 KB > + * (~1KB for INCSSPD) and touches the first and the last element > + * in the range, which triggers a page fault if the range is not > + * in a shadow stack. Because of this, creating 4-KB guard pages > + * around a shadow stack prevents these instructions from going > + * beyond. > + * > + * Creation of VM_SHADOW_STACK is tightly controlled, so a vma > + * can't be both VM_GROWSDOWN and VM_SHADOW_STACK > + */ Thank you for the details on how the size choice is made here! :) > diff --git a/include/linux/mm.h b/include/linux/mm.h > index fef14ab3abcb..09458e77bf52 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2775,15 +2775,16 @@ struct vm_area_struct *vma_lookup(struct mm_struct *mm, unsigned long addr) > return vma; > } > > +unsigned long stack_guard_start_gap(struct vm_area_struct *vma); > + > static inline unsigned long vm_start_gap(struct vm_area_struct *vma) > { > + unsigned long gap = stack_guard_start_gap(vma); > unsigned long vm_start = vma->vm_start; > > - if (vma->vm_flags & VM_GROWSDOWN) { > - vm_start -= stack_guard_gap; > - if (vm_start > vma->vm_start) > - vm_start = 0; > - } > + vm_start -= gap; > + if (vm_start > vma->vm_start) > + vm_start = 0; > return vm_start; > } > > diff --git a/mm/mmap.c b/mm/mmap.c > index 9d780f415be3..f0d2e9143bd0 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -247,6 +247,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) > return origbrk; > } > I feel like something could be done with this definitions to make them inline, instead of __weak: #ifndef stack_guard_start_gap > +unsigned long __weak stack_guard_start_gap(struct vm_area_struct *vma) > +{ > + if (vma->vm_flags & VM_GROWSDOWN) > + return stack_guard_gap; > + return 0; > +} #endif And then move the x86 stack_guard_start_gap to a header? It's not exactly fast-path, but it feels a little weird. Regardlesss: Reviewed-by: Kees Cook -- Kees Cook