leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'safesetid-5.13' of git://github.com/micah-morton/linux

Browse Source 
Pull SafeSetID update from Micah Morton:
 "Simple code cleanup

  This just has a single three-line code cleanup to eliminate some
  unnecessary 'break' statements"

* tag 'safesetid-5.13' of git://github.com/micah-morton/linux:
  LSM: SafeSetID: Fix code specification by scripts/checkpatch.pl
This commit is contained in:
Linus Torvalds
2021-05-05 12:08:06 -07:00
parent d665ea6ea8 1ca86ac1ec
commit d29c9bb010
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
security/safesetid/lsm.c
View File

@@ -125,7 +125,6 @@ static int safesetid_security_capable(const struct cred *cred,
pr_warn("Operation requires CAP_SETUID, which is not available to UID %u for operations besides approved set*uid transitions\n", pr_warn("Operation requires CAP_SETUID, which is not available to UID %u for operations besides approved set*uid transitions\n",
__kuid_val(cred->uid)); __kuid_val(cred->uid));
return -EPERM; return -EPERM;
break;
case CAP_SETGID: case CAP_SETGID:
/* /*
* If no policy applies to this task, allow the use of CAP_SETGID for * If no policy applies to this task, allow the use of CAP_SETGID for
@@ -140,11 +139,9 @@ static int safesetid_security_capable(const struct cred *cred,
pr_warn("Operation requires CAP_SETGID, which is not available to GID %u for operations besides approved set*gid transitions\n", pr_warn("Operation requires CAP_SETGID, which is not available to GID %u for operations besides approved set*gid transitions\n",
__kuid_val(cred->uid)); __kuid_val(cred->uid));
return -EPERM; return -EPERM;
break;
default: default:
/* Error, the only capabilities were checking for is CAP_SETUID/GID */ /* Error, the only capabilities were checking for is CAP_SETUID/GID */
return 0; return 0;
break;
} }
return 0; return 0;
} }