Commit d29c9bb0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents d665ea6e 1ca86ac1

security/safesetid/lsm.c

+0 −3
Original line number Diff line number Diff line
@@ -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",

			__kuid_val(cred->uid));

		return -EPERM;

		break;

	case CAP_SETGID:

		/*

		* 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",

			__kuid_val(cred->uid));

		return -EPERM;

		break;

	default:

		/* Error, the only capabilities were checking for is CAP_SETUID/GID */

		return 0;

		break;

	}

	return 0;

}