Merge 5.8-rc1 into android-mainline
Linux 5.8-rc1 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I00f2168bc9b6fd8e48c7c0776088d2c6cb8e1629
This commit is contained in:
15
kernel/sys.c
15
kernel/sys.c
@@ -395,6 +395,10 @@ long __sys_setregid(gid_t rgid, gid_t egid)
|
||||
new->sgid = new->egid;
|
||||
new->fsgid = new->egid;
|
||||
|
||||
retval = security_task_fix_setgid(new, old, LSM_SETID_RE);
|
||||
if (retval < 0)
|
||||
goto error;
|
||||
|
||||
return commit_creds(new);
|
||||
|
||||
error:
|
||||
@@ -437,6 +441,10 @@ long __sys_setgid(gid_t gid)
|
||||
else
|
||||
goto error;
|
||||
|
||||
retval = security_task_fix_setgid(new, old, LSM_SETID_ID);
|
||||
if (retval < 0)
|
||||
goto error;
|
||||
|
||||
return commit_creds(new);
|
||||
|
||||
error:
|
||||
@@ -758,6 +766,10 @@ long __sys_setresgid(gid_t rgid, gid_t egid, gid_t sgid)
|
||||
new->sgid = ksgid;
|
||||
new->fsgid = new->egid;
|
||||
|
||||
retval = security_task_fix_setgid(new, old, LSM_SETID_RES);
|
||||
if (retval < 0)
|
||||
goto error;
|
||||
|
||||
return commit_creds(new);
|
||||
|
||||
error:
|
||||
@@ -864,7 +876,8 @@ long __sys_setfsgid(gid_t gid)
|
||||
ns_capable(old->user_ns, CAP_SETGID)) {
|
||||
if (!gid_eq(kgid, old->fsgid)) {
|
||||
new->fsgid = kgid;
|
||||
goto change_okay;
|
||||
if (security_task_fix_setgid(new,old,LSM_SETID_FS) == 0)
|
||||
goto change_okay;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user