Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752795Ab3HFICt (ORCPT ); Tue, 6 Aug 2013 04:02:49 -0400 Received: from intranet.asianux.com ([58.214.24.6]:23046 "EHLO intranet.asianux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751701Ab3HFICq (ORCPT ); Tue, 6 Aug 2013 04:02:46 -0400 X-Spam-Score: -100.8 Message-ID: <5200AD67.1030109@asianux.com> Date: Tue, 06 Aug 2013 16:01:43 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Kees Cook , Al Viro , Oleg Nesterov , holt@sgi.com CC: Andrew Morton , "linux-kernel@vger.kernel.org" Subject: [PATCH 1/2] kernel/sys.c: return the current gid when error occurs References: <5200AD26.8070701@asianux.com> In-Reply-To: <5200AD26.8070701@asianux.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1294 Lines: 47 According to the API definition, when error occurs, need return current fsgid instead of the previous one. The related informations ("man setfsgid"): RETURN VALUE On success, the previous value of fsgid is returned. On error, the current value of fsgid is returned. Signed-off-by: Chen Gang --- kernel/sys.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/sys.c b/kernel/sys.c index 771129b..9356dc8 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -775,11 +775,11 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid) kgid = make_kgid(old->user_ns, gid); if (!gid_valid(kgid)) - return old_fsgid; + return gid; new = prepare_creds(); if (!new) - return old_fsgid; + return gid; if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) || gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) || @@ -791,7 +791,7 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid) } abort_creds(new); - return old_fsgid; + return gid; change_okay: commit_creds(new); -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/