lkml.org 
[lkml]   [2013]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 2/2] kernel/sys.c: remove useless variable 'old_fsgid' for setfsgid()
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);
}
}

abort_creds(new);
return gid;
-
-change_okay:
- commit_creds(new);
- return old_fsgid;
}

/**
--
1.7.7.6

\
 
 \ /
  Last update: 2013-08-06 10:21    [W:0.136 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site