LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] Fix msr check in compat_sys_swapcontext
@ 2008-11-05 12:30 Andreas Schwab
  2008-11-06  0:52 ` Paul Mackerras
  0 siblings, 1 reply; 5+ messages in thread
From: Andreas Schwab @ 2008-11-05 12:30 UTC (permalink / raw)
  To: linuxppc-dev; +Cc: linux-kernel

The new context may not be 16-byte aligned, so the real address of the
mcontext structure should be read from the uc_regs pointer instead of
directly using the (unaligned) uc_mcontext field.

Signed-off-by: Andreas Schwab <schwab@suse.de>

---
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index a6a4310..dc10720 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -941,9 +941,17 @@ long sys_swapcontext(struct ucontext __user *old_ctx,
 #ifdef CONFIG_PPC64
 	unsigned long new_msr = 0;
 
-	if (new_ctx &&
-	    get_user(new_msr, &new_ctx->uc_mcontext.mc_gregs[PT_MSR]))
-		return -EFAULT;
+	if (new_ctx) {
+		struct mcontext __user *mcp;
+		u32 cmcp;
+
+		/* Get pointer to the real mcontext. */
+		if (__get_user(cmcp, &new_ctx->uc_regs))
+			return -EFAULT;
+		mcp = (struct mcontext __user *)(u64)cmcp;
+		if (__get_user(new_msr, &mcp->mc_gregs[PT_MSR]))
+			return -EFAULT;
+	}
 	/*
 	 * Check that the context is not smaller than the original
 	 * size (with VMX but without VSX)

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Fix msr check in compat_sys_swapcontext
  2008-11-05 12:30 [PATCH] Fix msr check in compat_sys_swapcontext Andreas Schwab
@ 2008-11-06  0:52 ` Paul Mackerras
  2008-11-06  9:23   ` Andreas Schwab
  0 siblings, 1 reply; 5+ messages in thread
From: Paul Mackerras @ 2008-11-06  0:52 UTC (permalink / raw)
  To: Andreas Schwab; +Cc: linuxppc-dev, linux-kernel

Andreas Schwab writes:

> The new context may not be 16-byte aligned, so the real address of the
> mcontext structure should be read from the uc_regs pointer instead of
> directly using the (unaligned) uc_mcontext field.

Good catch, but...

> @@ -941,9 +941,17 @@ long sys_swapcontext(struct ucontext __user *old_ctx,
>  #ifdef CONFIG_PPC64
>  	unsigned long new_msr = 0;
>  
> -	if (new_ctx &&
> -	    get_user(new_msr, &new_ctx->uc_mcontext.mc_gregs[PT_MSR]))
> -		return -EFAULT;
> +	if (new_ctx) {
> +		struct mcontext __user *mcp;
> +		u32 cmcp;
> +
> +		/* Get pointer to the real mcontext. */
> +		if (__get_user(cmcp, &new_ctx->uc_regs))

we need to use get_user, not __get_user, since we haven't done an
access_ok() check on the address.

> +			return -EFAULT;
> +		mcp = (struct mcontext __user *)(u64)cmcp;
> +		if (__get_user(new_msr, &mcp->mc_gregs[PT_MSR]))

ditto here.

Paul.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Fix msr check in compat_sys_swapcontext
  2008-11-06  0:52 ` Paul Mackerras
@ 2008-11-06  9:23   ` Andreas Schwab
  2008-11-06 10:36     ` Paul Mackerras
  0 siblings, 1 reply; 5+ messages in thread
From: Andreas Schwab @ 2008-11-06  9:23 UTC (permalink / raw)
  To: Paul Mackerras; +Cc: linuxppc-dev, linux-kernel

Paul Mackerras <paulus@samba.org> writes:

> we need to use get_user, not __get_user, since we haven't done an
> access_ok() check on the address.

The address is always ok since its a compat pointer, see do_setcontext.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Fix msr check in compat_sys_swapcontext
  2008-11-06  9:23   ` Andreas Schwab
@ 2008-11-06 10:36     ` Paul Mackerras
  2008-11-06 10:49       ` Andreas Schwab
  0 siblings, 1 reply; 5+ messages in thread
From: Paul Mackerras @ 2008-11-06 10:36 UTC (permalink / raw)
  To: Andreas Schwab; +Cc: linuxppc-dev, linux-kernel

Andreas Schwab writes:

> Paul Mackerras <paulus@samba.org> writes:
> 
> > we need to use get_user, not __get_user, since we haven't done an
> > access_ok() check on the address.
> 
> The address is always ok since its a compat pointer, see do_setcontext.

OK, since it's inside a CONFIG_PPC64 block.  I'll add a paragraph to
the patch description pointing that out.

Paul.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Fix msr check in compat_sys_swapcontext
  2008-11-06 10:36     ` Paul Mackerras
@ 2008-11-06 10:49       ` Andreas Schwab
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Schwab @ 2008-11-06 10:49 UTC (permalink / raw)
  To: Paul Mackerras; +Cc: linuxppc-dev, linux-kernel

Paul Mackerras <paulus@samba.org> writes:

> Andreas Schwab writes:
>
>> Paul Mackerras <paulus@samba.org> writes:
>> 
>> > we need to use get_user, not __get_user, since we haven't done an
>> > access_ok() check on the address.
>> 
>> The address is always ok since its a compat pointer, see do_setcontext.
>
> OK, since it's inside a CONFIG_PPC64 block.  I'll add a paragraph to
> the patch description pointing that out.

How about this:

diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index a6a4310..b13abf3 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -941,9 +941,21 @@ long sys_swapcontext(struct ucontext __user *old_ctx,
 #ifdef CONFIG_PPC64
 	unsigned long new_msr = 0;
 
-	if (new_ctx &&
-	    get_user(new_msr, &new_ctx->uc_mcontext.mc_gregs[PT_MSR]))
-		return -EFAULT;
+	if (new_ctx) {
+		struct mcontext __user *mcp;
+		u32 cmcp;
+
+		/*
+		 * Get pointer to the real mcontext.  No need for
+		 * access_ok since we are dealing with compat
+		 * pointers.
+		 */
+		if (__get_user(cmcp, &new_ctx->uc_regs))
+			return -EFAULT;
+		mcp = (struct mcontext __user *)(u64)cmcp;
+		if (__get_user(new_msr, &mcp->mc_gregs[PT_MSR]))
+			return -EFAULT;
+	}
 	/*
 	 * Check that the context is not smaller than the original
 	 * size (with VMX but without VSX)

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2008-11-06 10:49 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-05 12:30 [PATCH] Fix msr check in compat_sys_swapcontext Andreas Schwab
2008-11-06  0:52 ` Paul Mackerras
2008-11-06  9:23   ` Andreas Schwab
2008-11-06 10:36     ` Paul Mackerras
2008-11-06 10:49       ` Andreas Schwab

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).