mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jiri Kosina <jkosina@suse.cz>
To: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>,
	linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] parisc: fix personality flag check in copy_thread()
Date: Thu, 2 Aug 2012 15:33:59 +0200 (CEST)	[thread overview]
Message-ID: <alpine.LNX.2.00.1208021531540.4820@pobox.suse.cz> (raw)
In-Reply-To: <1343912818.5073.48.camel@dabdike.int.hansenpartnership.com>

On Thu, 2 Aug 2012, James Bottomley wrote:

> > In case of parsic, let's take a process with current->personality == 
> > PER_LINUX32 callling personality(PER_LINUX | UNAME26). The
> > 
> >         if (personality(current->personality) == PER_LINUX32
> >             && personality == PER_LINUX)
> >                 personality = PER_LINUX32;
> > 
> > would that have no effect, and sys_personality() would be called with 
> > (PER_LINUX | UNAME26) instead of PER_LINUX32, just because of UNAME26 
> > being set as well. That doesn't seem really correct. Is it?
> 
> Heh, no.  This is a nasty mess.  

Indeed.

> Our assumption was that we own the flags ... hence the code.  There are 
> some flags we can't allow to be set or reset ... but that's only for the 
> mythical 64 bit userspace, so I suppose we just ignore that for now and 
> fix it if this ever appears.
>
> I don't like the hidden assumption that PER_LINUX == 0, but otherwise
> the code looks fine.
> 
> How about 
> 
> personality = (personality & ~PER_MASK) | PER_LINUX32;
> 
> and
> 
> err = (personality & ~PER_MASK) | PER_LINUX;

Agreed, that's a little bit nicer way how to express it (modulo the 
fact that the last 'personality' in your example should in fact be 'err'). 
Updated patch below, thanks.




From: Jiri Kosina <jkosina@suse.cz>
Subject: [PATCH 2/4] parisc: fix personality flag check in copy_thread()

Directly comparing task_struct->personality against PER_* is not fully
correct, as it doesn't take flags potentially stored in top three bytes
into account.

Analogically, directly forcefully setting personality to PER_LINUX32 or
PER_LINUX discards any flags stored in the top three bytes.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
v0->v1: fix the bit ops to reflect the fact that PER_LINUX is actually 0
v2->v2: express the PER_LINUX==0 fact in the bitops in a more obvious way

 arch/parisc/kernel/process.c    |    2 +-
 arch/parisc/kernel/sys_parisc.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index d4b94b3..2c05a92 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -309,7 +309,7 @@ copy_thread(unsigned long clone_flags, unsigned long usp,
 		cregs->ksp = (unsigned long)stack
 			+ (pregs->gr[21] & (THREAD_SIZE - 1));
 		cregs->gr[30] = usp;
-		if (p->personality == PER_HPUX) {
+		if (personality(p->personality) == PER_HPUX) {
 #ifdef CONFIG_HPUX
 			cregs->kpc = (unsigned long) &hpux_child_return;
 #else
diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
index c9b9322..7f9658e 100644
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
@@ -225,12 +225,12 @@ long parisc_personality(unsigned long personality)
 	long err;
 
 	if (personality(current->personality) == PER_LINUX32
-	    && personality == PER_LINUX)
-		personality = PER_LINUX32;
+	    && personality(personality) == PER_LINUX)
+		personality = (personality & ~PER_MASK) | PER_LINUX32;
 
 	err = sys_personality(personality);
-	if (err == PER_LINUX32)
-		err = PER_LINUX;
+	if (personality(err) == PER_LINUX32)
+		err = (err & ~PER_MASK) | PER_LINUX;
 
 	return err;
 }

-- 
Jiri Kosina
SUSE Labs

      reply	other threads:[~2012-08-02 13:34 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-01 19:57 [PATCH] " Jiri Kosina
2012-08-02  7:12 ` [PATCH v2] " Jiri Kosina
2012-08-02  8:47   ` James Bottomley
2012-08-02 11:45     ` Jiri Kosina
2012-08-02 13:06       ` James Bottomley
2012-08-02 13:33         ` Jiri Kosina [this message]

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=alpine.LNX.2.00.1208021531540.4820@pobox.suse.cz \
    --to=jkosina@suse.cz \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=deller@gmx.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-parisc@vger.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®