From: Jann Horn <jannh@google.com>
To: yu-cheng.yu@intel.com
Cc: the arch/x86 maintainers <x86@kernel.org>,
"H . Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
kernel list <linux-kernel@vger.kernel.org>,
linux-doc@vger.kernel.org, Linux-MM <linux-mm@kvack.org>,
linux-arch <linux-arch@vger.kernel.org>,
Linux API <linux-api@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
Andy Lutomirski <luto@amacapital.net>,
Balbir Singh <bsingharora@gmail.com>,
Cyrill Gorcunov <gorcunov@gmail.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Florian Weimer <fweimer@redhat.com>,
hjl.tools@gmail.com, Jonathan Corbet <corbet@lwn.net>,
Kees Cook <keescook@chromium.org>,
Mike Kravetz <mike.kravetz@oracle.com>,
Nadav Amit <nadav.amit@gmail.com>,
Oleg Nesterov <oleg@redhat.com>, Pavel Machek <pavel@ucw.cz>,
Peter Zijlstra <peterz@infradead.org>,
rdunlap@infradead.org, ravi.v.shankar@intel.com,
vedvyas.shanbhogue@intel.com
Subject: Re: [RFC PATCH v4 20/27] x86/cet/shstk: Signal handling for shadow stack
Date: Wed, 3 Oct 2018 18:46:46 +0200 [thread overview]
Message-ID: <CAG48ez32qC1wfXGROpXxdxD84Ktj6QXNAC=Y0A6TQu=mHF-ekQ@mail.gmail.com> (raw)
Message-ID: <20181003164646.lOwj5Th9Ju6gX5FOlVEt3hU_-KYEfAM75wNZ_IKOAyY@z> (raw)
In-Reply-To: <20180921150351.20898-21-yu-cheng.yu@intel.com>
On Fri, Sep 21, 2018 at 5:09 PM Yu-cheng Yu <yu-cheng.yu@intel.com> wrote:
> When setting up a signal, the kernel creates a shadow stack
> restore token at the current SHSTK address and then stores the
> token's address in the signal frame, right after the FPU state.
> Before restoring a signal, the kernel verifies and then uses the
> restore token to set the SHSTK pointer.
[...]
> +#ifdef CONFIG_X86_64
> +static int copy_ext_from_user(struct sc_ext *ext, void __user *fpu)
> +{
> + void __user *p;
> +
> + if (!fpu)
> + return -EINVAL;
> +
> + p = fpu + fpu_user_xstate_size + FP_XSTATE_MAGIC2_SIZE;
> + p = (void __user *)ALIGN((unsigned long)p, 8);
> +
> + if (!access_ok(VERIFY_READ, p, sizeof(*ext)))
> + return -EFAULT;
> +
> + if (__copy_from_user(ext, p, sizeof(*ext)))
> + return -EFAULT;
Why do you first manually call access_ok(), then call
__copy_from_user() with the same size? Just use "if
(copy_from_user(ext, p, sizeof(*ext)))" (without underscores) and get
rid of the access_ok().
> + if (ext->total_size != sizeof(*ext))
> + return -EINVAL;
> + return 0;
> +}
> +
> +static int copy_ext_to_user(void __user *fpu, struct sc_ext *ext)
> +{
> + void __user *p;
> +
> + if (!fpu)
> + return -EINVAL;
> +
> + if (ext->total_size != sizeof(*ext))
> + return -EINVAL;
> +
> + p = fpu + fpu_user_xstate_size + FP_XSTATE_MAGIC2_SIZE;
> + p = (void __user *)ALIGN((unsigned long)p, 8);
> +
> + if (!access_ok(VERIFY_WRITE, p, sizeof(*ext)))
> + return -EFAULT;
> +
> + if (__copy_to_user(p, ext, sizeof(*ext)))
> + return -EFAULT;
Same as above.
> + return 0;
> +}
next prev parent reply other threads:[~2018-10-03 23:36 UTC|newest]
Thread overview: 142+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-21 15:03 [RFC PATCH v4 00/27] Control Flow Enforcement: Shadow Stack Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 01/27] x86/cpufeatures: Add CPUIDs for Control-flow Enforcement Technology (CET) Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-25 16:27 ` Peter Zijlstra
2018-09-25 16:27 ` Peter Zijlstra
2018-09-25 16:29 ` Yu-cheng Yu
2018-09-25 16:29 ` Yu-cheng Yu
2018-09-28 16:51 ` Borislav Petkov
2018-09-28 16:51 ` Borislav Petkov
2018-09-28 16:56 ` Yu-cheng Yu
2018-09-28 16:56 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 02/27] x86/fpu/xstate: Change some names to separate XSAVES system and user states Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-25 16:37 ` Peter Zijlstra
2018-09-25 16:37 ` Peter Zijlstra
2018-10-02 15:29 ` Borislav Petkov
2018-10-02 15:29 ` Borislav Petkov
2018-10-02 16:21 ` Yu-cheng Yu
2018-10-02 16:21 ` Yu-cheng Yu
2018-10-02 16:30 ` Dave Hansen
2018-10-02 16:30 ` Dave Hansen
2018-10-02 16:37 ` Borislav Petkov
2018-10-02 16:37 ` Borislav Petkov
2018-10-02 16:39 ` Dave Hansen
2018-10-02 16:39 ` Dave Hansen
2018-10-02 16:43 ` Yu-cheng Yu
2018-10-02 16:43 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 03/27] x86/fpu/xstate: Enable XSAVES system states Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-25 17:03 ` Peter Zijlstra
2018-09-25 17:03 ` Peter Zijlstra
2018-09-25 17:23 ` Yu-cheng Yu
2018-09-25 17:23 ` Yu-cheng Yu
2018-10-02 17:15 ` Borislav Petkov
2018-10-02 17:15 ` Borislav Petkov
2018-10-04 15:47 ` Yu-cheng Yu
2018-10-04 15:47 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 04/27] x86/fpu/xstate: Add XSAVES system states for shadow stack Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 05/27] Documentation/x86: Add CET description Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 06/27] x86/cet: Control protection exception handler Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-10-03 10:39 ` Eugene Syromiatnikov
2018-10-03 10:39 ` Eugene Syromiatnikov
2018-10-03 16:11 ` Yu-cheng Yu
2018-10-03 16:11 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 07/27] x86/cet/shstk: Add Kconfig option for user-mode shadow stack Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 08/27] mm: Introduce VM_SHSTK for shadow stack memory Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 09/27] x86/mm: Change _PAGE_DIRTY to _PAGE_DIRTY_HW Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-10-03 13:38 ` Matthew Wilcox
2018-10-03 13:38 ` Matthew Wilcox
2018-10-03 14:05 ` Dave Hansen
2018-10-03 14:05 ` Dave Hansen
2018-10-03 16:07 ` Yu-cheng Yu
2018-10-03 16:07 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 10/27] drm/i915/gvt: Update _PAGE_DIRTY to _PAGE_DIRTY_BITS Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-10-03 13:19 ` Eugene Syromiatnikov
2018-10-03 13:19 ` Eugene Syromiatnikov
2018-09-21 15:03 ` [RFC PATCH v4 11/27] x86/mm: Introduce _PAGE_DIRTY_SW Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 12/27] x86/mm: Modify ptep_set_wrprotect and pmdp_set_wrprotect for _PAGE_DIRTY_SW Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 13/27] x86/mm: Shadow stack page fault error checking Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 14/27] mm: Handle shadow stack page fault Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 15/27] mm: Handle THP/HugeTLB " Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 16/27] mm: Update can_follow_write_pte/pmd for shadow stack Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 17/27] mm: Introduce do_mmap_locked() Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 18/27] x86/cet/shstk: User-mode shadow stack support Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-10-03 15:08 ` Eugene Syromiatnikov
2018-10-03 15:08 ` Eugene Syromiatnikov
2018-10-03 15:12 ` Yu-cheng Yu
2018-10-03 15:12 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 19/27] x86/cet/shstk: Introduce WRUSS instruction Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-10-03 4:15 ` Eugene Syromiatnikov
2018-10-03 4:15 ` Eugene Syromiatnikov
2018-09-21 15:03 ` [RFC PATCH v4 20/27] x86/cet/shstk: Signal handling for shadow stack Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-10-03 14:36 ` Eugene Syromiatnikov
2018-10-03 14:36 ` Eugene Syromiatnikov
2018-10-03 16:46 ` Jann Horn [this message]
2018-10-03 16:46 ` Jann Horn
2018-09-21 15:03 ` [RFC PATCH v4 21/27] x86/cet/shstk: ELF header parsing of Shadow Stack Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-10-03 23:27 ` Eugene Syromiatnikov
2018-10-03 23:27 ` Eugene Syromiatnikov
2018-10-09 21:15 ` Yu-cheng Yu
2018-10-09 21:15 ` Yu-cheng Yu
2018-10-15 23:40 ` Kees Cook
2018-10-15 23:40 ` Kees Cook
2018-10-16 17:23 ` Yu-cheng Yu
2018-10-16 17:23 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 22/27] x86/cet/shstk: Handle thread shadow stack Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 23/27] mm/map: Add Shadow stack pages to memory accounting Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 16:55 ` Randy Dunlap
2018-09-21 16:55 ` Randy Dunlap
2018-09-21 17:21 ` Yu-cheng Yu
2018-09-21 17:21 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 24/27] mm/mmap: Create a guard area between VMAs Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-10-03 4:56 ` Eugene Syromiatnikov
2018-10-03 4:56 ` Eugene Syromiatnikov
2018-10-03 5:36 ` Andy Lutomirski
2018-10-03 5:36 ` Andy Lutomirski
2018-10-03 16:00 ` Yu-cheng Yu
2018-10-03 16:00 ` Yu-cheng Yu
2018-10-03 16:18 ` Andy Lutomirski
2018-10-03 16:18 ` Andy Lutomirski
2018-10-03 16:32 ` Eugene Syromiatnikov
2018-10-03 16:32 ` Eugene Syromiatnikov
2018-10-03 16:40 ` Yu-cheng Yu
2018-10-03 16:40 ` Yu-cheng Yu
2018-10-03 16:52 ` Jann Horn
2018-10-03 16:52 ` Jann Horn
2018-10-03 21:21 ` Eugene Syromiatnikov
2018-10-03 21:21 ` Eugene Syromiatnikov
2018-09-21 15:03 ` [RFC PATCH v4 25/27] mm/mmap: Prevent Shadow Stack VMA merges Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 15:03 ` [RFC PATCH v4 26/27] x86/cet/shstk: Add arch_prctl functions for Shadow Stack Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-10-03 17:57 ` Eugene Syromiatnikov
2018-10-03 17:57 ` Eugene Syromiatnikov
2018-09-21 15:03 ` [RFC PATCH v4 27/27] x86/cet/shstk: Add Shadow Stack instructions to opcode map Yu-cheng Yu
2018-09-21 15:03 ` Yu-cheng Yu
2018-09-21 22:53 ` [RFC PATCH v4 00/27] Control Flow Enforcement: Shadow Stack Dave Hansen
2018-09-21 22:53 ` Dave Hansen
2018-09-24 15:25 ` Yu-cheng Yu
2018-09-24 15:25 ` Yu-cheng Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAG48ez32qC1wfXGROpXxdxD84Ktj6QXNAC=Y0A6TQu=mHF-ekQ@mail.gmail.com' \
--to=jannh@google.com \
--cc=arnd@arndb.de \
--cc=bsingharora@gmail.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=fweimer@redhat.com \
--cc=gorcunov@gmail.com \
--cc=hjl.tools@gmail.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@amacapital.net \
--cc=mike.kravetz@oracle.com \
--cc=mingo@redhat.com \
--cc=nadav.amit@gmail.com \
--cc=oleg@redhat.com \
--cc=pavel@ucw.cz \
--cc=peterz@infradead.org \
--cc=ravi.v.shankar@intel.com \
--cc=rdunlap@infradead.org \
--cc=tglx@linutronix.de \
--cc=vedvyas.shanbhogue@intel.com \
--cc=x86@kernel.org \
--cc=yu-cheng.yu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).