Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp851073pxf; Thu, 1 Apr 2021 15:43:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGGMHnbu4aN91PSe5vefF4s1KgBU4gxxvaIsztrHORYnKsGzmeibh6MZyKzHdJJ+VPRXJs X-Received: by 2002:a17:907:d1f:: with SMTP id gn31mr11388225ejc.536.1617316987880; Thu, 01 Apr 2021 15:43:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617316987; cv=none; d=google.com; s=arc-20160816; b=XC2/aRIvvny1ZXVTxr2oLh+7rv41Tz3uwqjCt9c9MmDHXnUS9YeFyCasB28kYGvB65 nZzafGx62Erb41VE9FjC/9Yv4uBs04iRqaxE4fMP5sKG+64PS4t+8ZiAeOF3y0An1U8s LbunTidizBqBNRrbyrVrY+XSNKg8MqO1k27mGeLzSWTWY++oZtPA6SNQy5bI5RHDwrLz D8smMBLBPq/c74OF1WgbMS0WDME/KLnqDB61mPaRmKxo6mQJiJi1DRIAnhL+dMdWTtOu Bq8YQlpYOWe395EQGAGIaMniyIfnZNy+KH3TBbEhk8+RZq9JmVD00qHmDOfEGcqbal7e 3mBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=XHU/CSlbR0tXIQ7skc+D9M4sQ8Nf+DFxpytkWh85RTc=; b=EU9JXs1vB7yJvlfF3vrvYh1/zHyZlkI/ybLZ1ITEIrJFiaxJk62ecesyKNgfF0hgyS EAGQnkX2SnYKwfICFgNcyB/qUXpw9dFtiGrwK8pkn73xcDtQ6YeonHtzsu9RPphCrTiZ fIKl2yOaamgk7xu5KXZX5NqTD4oAtX0zPTlU054LFAhEU9M/Blzo89KT3cuggmxqjWUX 51mSlud3PopnuqY3u+k7KBxUu4eEuam9svdTNssPsx251+/YKjaz9yc1DP+kzzAExEfp emvrvo9HrLBnGRLZIPeU8gaOgwc4F6Ty4RvVn/wJVnzUsNnoTNAnhBSfNTHl0ouY46e6 lfJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Cdeb4TJr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p15si5086101ejr.236.2021.04.01.15.42.43; Thu, 01 Apr 2021 15:43:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Cdeb4TJr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234103AbhDAWmP (ORCPT + 99 others); Thu, 1 Apr 2021 18:42:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233965AbhDAWmN (ORCPT ); Thu, 1 Apr 2021 18:42:13 -0400 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB723C0613E6 for ; Thu, 1 Apr 2021 15:42:11 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id h25so2499302pgm.3 for ; Thu, 01 Apr 2021 15:42:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=XHU/CSlbR0tXIQ7skc+D9M4sQ8Nf+DFxpytkWh85RTc=; b=Cdeb4TJryjuUvq0PZ22+p9aZ80XrqpLOQqZBbyxQf2b3KNvemF9hZdYHkWk2rvgvr9 +SpPIdq+JMo2g9UMPmRHYMNVYDXvm5KREo94cbMizN1C/uol3pIjbIlmE2pjHUirEook l3tfPMZVPC0JP0fRuhcSZ92o1n77ukI4HC3SY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=XHU/CSlbR0tXIQ7skc+D9M4sQ8Nf+DFxpytkWh85RTc=; b=NWV6Ppxna9T73vwNkgHV6xuPmMKIwmVAUtOfZrnX4Z8LdyOe9JE6Rkx2rqacdFJPyX XibarCcSqQPRfowMdlMQkCvbmFXmqWyaATeo8xdw13vgvYfEc7jwXTHdcFYuYmPAlMG4 mzyoTJw26iBRwsXFpeBjdMS8t2etdzesVx6lrMND9ARBpchaO4Yzzi0MI8eRTjclDU+0 tKWnJU9WkydNJz51AeJb3HmEGfAF0cTqVVYcU13crmPtUWwqcfck3msdHPkVgJ0rsyp4 epbLVhKboOrS3b90PvICU1+qxRDXmz1nloXwMJ7Nkoyk9xTi386RkdXXJvwjr+u8F00V mfPw== X-Gm-Message-State: AOAM533YvrT7D2ajonaCmjcRZOmEjsc0q8qMHUariQsg42MzNzvfbi/P haEPTf4x16FG3/CuSwHGq6Dduw== X-Received: by 2002:a65:56cc:: with SMTP id w12mr9470880pgs.354.1617316931239; Thu, 01 Apr 2021 15:42:11 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id a7sm6246426pfo.105.2021.04.01.15.42.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 15:42:10 -0700 (PDT) Date: Thu, 1 Apr 2021 15:42:08 -0700 From: Kees Cook To: David Laight Cc: 'Will Deacon' , Thomas Gleixner , Elena Reshetova , "x86@kernel.org" , Andy Lutomirski , Peter Zijlstra , Catalin Marinas , Mark Rutland , Alexander Potapenko , Alexander Popov , Ard Biesheuvel , Jann Horn , Vlastimil Babka , David Hildenbrand , Mike Rapoport , Andrew Morton , Jonathan Corbet , Randy Dunlap , "kernel-hardening@lists.openwall.com" , "linux-hardening@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH v8 3/6] stack: Optionally randomize kernel stack offset each syscall Message-ID: <202104011447.2E7F543@keescook> References: <20210330205750.428816-1-keescook@chromium.org> <20210330205750.428816-4-keescook@chromium.org> <20210401083034.GA8554@willie-the-truck> <61ae9398a03d4fe7868b68c9026d5998@AcuMS.aculab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <61ae9398a03d4fe7868b68c9026d5998@AcuMS.aculab.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 01, 2021 at 11:15:43AM +0000, David Laight wrote: > From: Will Deacon > > Sent: 01 April 2021 09:31 > ... > > > +/* > > > + * These macros must be used during syscall entry when interrupts and > > > + * preempt are disabled, and after user registers have been stored to > > > + * the stack. > > > + */ > > > +#define add_random_kstack_offset() do { \ > > > + if (static_branch_maybe(CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT, \ > > > + &randomize_kstack_offset)) { \ > > > + u32 offset = __this_cpu_read(kstack_offset); \ > > > + u8 *ptr = __builtin_alloca(KSTACK_OFFSET_MAX(offset)); \ > > > + asm volatile("" : "=m"(*ptr) :: "memory"); \ > > > > Using the "m" constraint here is dangerous if you don't actually evaluate it > > inside the asm. For example, if the compiler decides to generate an > > addressing mode relative to the stack but with writeback (autodecrement), then > > the stack pointer will be off by 8 bytes. Can you use "o" instead? I see other examples of empty asm, but it's true, none are using "=m" read constraints. But, yes, using "o" appears to work happily. > Is it allowed to use such a mode? > It would have to know that the "m" was substituted exactly once. > I think there are quite a few examples with 'strange' uses of memory > asm arguments. > > However, in this case, isn't it enough to ensure the address is 'saved'? > So: > asm volatile("" : "=r"(ptr) ); > should be enough. It isn't, it seems. Here's a comparison: https://godbolt.org/z/xYGn9GfGY So, I'll resend with "o", and with raw_cpu_*(). Thanks! -- Kees Cook