From: Chen Gang <gang.chen@asianux.com>
To: Kees Cook <keescook@chromium.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Oleg Nesterov <oleg@redhat.com>,
holt@sgi.com
Cc: Andrew Morton <akpm@linux-foundation.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/2] kernel/sys.c: remove useless variable 'old_fsgid' for setfsgid()
Date: Tue, 06 Aug 2013 16:56:31 +0800 [thread overview]
Message-ID: <5200BA3F.3090809@asianux.com> (raw)
In-Reply-To: <5200ADB0.7020206@asianux.com>
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@asianux.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
next prev parent reply other threads:[~2013-08-06 8:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-06 8:00 [PATCH 0/2] kernel/sys.c: for setfsgid(), return the current gid when error occurs Chen Gang
2013-08-06 8:01 ` [PATCH 1/2] kernel/sys.c: " Chen Gang
2013-08-06 20:21 ` Andy Lutomirski
2013-08-07 3:30 ` Chen Gang
2013-08-07 16:21 ` Oleg Nesterov
2013-08-07 16:58 ` Andy Lutomirski
2013-08-08 1:30 ` Chen Gang
2013-08-08 1:35 ` Andy Lutomirski
2013-08-08 1:48 ` Chen Gang
2013-08-08 13:52 ` Michael Kerrisk (man-pages)
2013-08-09 0:55 ` Chen Gang
2013-08-08 13:37 ` Michael Kerrisk (man-pages)
2013-08-09 0:59 ` Chen Gang
2013-08-09 7:27 ` Michael Kerrisk (man-pages)
2013-08-06 8:02 ` [PATCH 2/2] kernel/sys.c: remove useless variable 'old_fsgid' for setfsgid() Chen Gang
2013-08-06 8:56 ` Chen Gang [this message]
2013-08-06 8:13 ` kernel/sys.c: for setfsuid(), return the current uid when error occurs Chen Gang
2013-08-06 8:14 ` Chen Gang
2013-08-06 8:15 ` [PATCH 0/2] " Chen Gang
2013-08-06 8:15 ` [PATCH 1/2] kernel/sys.c: " Chen Gang
2013-08-06 8:16 ` [PATCH 2/2] kernel/sys.c: remove useless variable 'old_fsuid' for setfsuid() Chen Gang
2013-08-06 8:55 ` Chen Gang
2013-08-06 8:43 ` [PATCH] kernel/sys.c: improve the usage of return value Chen Gang
2013-08-07 10:44 ` Chen Gang
2013-08-06 18:36 ` [PATCH 0/2] kernel/sys.c: for setfsgid(), return the current gid when error occurs Kees Cook
2013-08-07 2:25 ` Chen Gang
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=5200BA3F.3090809@asianux.com \
--to=gang.chen@asianux.com \
--cc=akpm@linux-foundation.org \
--cc=holt@sgi.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=viro@zeniv.linux.org.uk \
/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