[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5200BA3F.3090809@asianux.com>
Date: Tue, 06 Aug 2013 16:56:31 +0800
From: Chen Gang <gang.chen@...anux.com>
To: Kees Cook <keescook@...omium.org>,
Al Viro <viro@...iv.linux.org.uk>,
Oleg Nesterov <oleg@...hat.com>, holt@....com
CC: Andrew Morton <akpm@...ux-foundation.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 2/2] kernel/sys.c: remove useless variable 'old_fsgid'
for setfsgid()
On 08/06/2013 04:02 PM, Chen Gang wrote:
> Remove useless variable 'old_fsgid' to make code clearer for readers.
>
> Signed-off-by: Chen Gang <gang.chen@...anux.com>
> ---
> kernel/sys.c | 9 ++-------
> 1 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/kernel/sys.c b/kernel/sys.c
> index 9356dc8..fc169d8 100644
> --- a/kernel/sys.c
> +++ b/kernel/sys.c
> @@ -767,11 +767,9 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
> {
> const struct cred *old;
> struct cred *new;
> - gid_t old_fsgid;
> kgid_t kgid;
>
> old = current_cred();
> - old_fsgid = from_kgid_munged(old->user_ns, old->fsgid);
>
> kgid = make_kgid(old->user_ns, gid);
> if (!gid_valid(kgid))
> @@ -786,16 +784,13 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
> nsown_capable(CAP_SETGID)) {
> if (!gid_eq(kgid, old->fsgid)) {
> new->fsgid = kgid;
> - goto change_okay;
> + commit_creds(new);
> + return from_kgid_munged(old->user_ns, old->fsgid);
The same, should old_fsgid be get before commit_creds() or prepare_creds() ?
Thanks.
> }
> }
>
> abort_creds(new);
> return gid;
> -
> -change_okay:
> - commit_creds(new);
> - return old_fsgid;
> }
>
> /**
>
--
Chen Gang
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists