mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
To: Scott Bauer <sbauer@eng.utah.edu>
Cc: linux-kernel@vger.kernel.org,
	kernel-hardening@lists.openwall.com, x86@kernel.org,
	wmealing@redhat.com, ak@linux.intel.com, luto@amacapital.net,
	Abhiram Balasubramanian <abhiram@cs.utah.edu>
Subject: Re: [PATCH v3 2/3] x86: SROP mitigation: implement signal cookies
Date: Tue, 8 Mar 2016 21:03:33 +0000	[thread overview]
Message-ID: <20160308210333.7ad77a29@lxorguk.ukuu.org.uk> (raw)
In-Reply-To: <1457470075-4586-2-git-send-email-sbauer@eng.utah.edu>

>  static int ia32_restore_sigcontext(struct pt_regs *regs,
> -				   struct sigcontext_32 __user *sc)
> +				   struct sigcontext_32 __user *sc,
> +				   void __user **user_cookie)
>  {
>  	unsigned int tmpflags, err = 0;
>  	void __user *buf;
> @@ -105,6 +106,16 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,
>  		buf = compat_ptr(tmp);
>  	} get_user_catch(err);
>  
> +	/*
> +	 * If there is fp state get cookie from the top of the fp state,
> +	 * else get it from the top of the sig frame.
> +	 */
> +
> +	if (tmp != 0)
> +		*user_cookie = compat_ptr(tmp + fpu__getsize(1));
> +	else
> +		*user_cookie = NULL;

user_cookie is is __user, so shouldn't just be poking at it without
get/put_user ? It might fault if someone has engineered a bad stack frame.

Alan

  reply	other threads:[~2016-03-08 21:04 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-08 20:47 [PATCH v3 1/3] SROP Mitigation: Architecture independent code for " Scott Bauer
2016-03-08 20:47 ` [PATCH v3 2/3] x86: SROP mitigation: implement " Scott Bauer
2016-03-08 21:03   ` One Thousand Gnomes [this message]
2016-03-08 21:38     ` Scotty Bauer
2016-03-08 20:47 ` [PATCH v3 3/3] SROP mitigation: Add sysctl to disable SROP protection Scott Bauer
2016-03-08 21:00   ` One Thousand Gnomes
2016-03-10  6:36     ` [kernel-hardening] " Kees Cook
2016-03-10  6:46       ` Andy Lutomirski
2016-03-08 20:58 ` [PATCH v3 1/3] SROP Mitigation: Architecture independent code for signal cookies Andy Lutomirski
2016-03-08 21:49   ` Scotty Bauer
2016-03-08 21:57     ` Andy Lutomirski
2016-03-08 22:06       ` Scotty Bauer
2016-03-09 22:02       ` Scotty Bauer
2016-03-08 21:04 ` kbuild test robot
2016-03-09  8:32 ` Ingo Molnar
2016-03-09 22:07   ` Scotty Bauer
2016-03-09 22:22     ` Jonathan Corbet
2016-03-10  9:43       ` Ingo Molnar

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=20160308210333.7ad77a29@lxorguk.ukuu.org.uk \
    --to=gnomes@lxorguk.ukuu.org.uk \
    --cc=abhiram@cs.utah.edu \
    --cc=ak@linux.intel.com \
    --cc=kernel-hardening@lists.openwall.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=sbauer@eng.utah.edu \
    --cc=wmealing@redhat.com \
    --cc=x86@kernel.org \
    /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

all inboxes | Powered by JetHome®