Skip to contentSkip to conversation

security: remove unneeded break

PATCH In review [email protected] 4 participants 4 messages Oct 19, 2020 – Oct 27, 2020

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 security: remove unneeded break

From: Tom Rix <[email protected]>

A break is not needed if it is preceded by a return

---
 security/integrity/ima/ima_appraise.c     | 1 -
 security/keys/trusted-keys/trusted_tpm1.c | 1 -
 security/safesetid/lsm.c                  | 3 ---
 3 files changed, 5 deletions(-)
security/integrity/ima/ima_appraise.c +0 -1
index 3dd8c2e4314e..f400a6122b3c 100644
@@ -181,7 +181,6 @@ enum hash_algo ima_get_hash_algo(struct evm_ima_xattr_data *xattr_value,
 		if (sig->version != 2 || xattr_len <= sizeof(*sig))
 			return ima_hash_algo;
 		return sig->hash_algo;
-		break;
 	case IMA_XATTR_DIGEST_NG:
 		/* first byte contains algorithm id */
 		ret = xattr_value->data[0];
security/keys/trusted-keys/trusted_tpm1.c +0 -1
index b9fe02e5f84f..eddc9477d42a 100644
@@ -901,7 +901,6 @@ static int datablob_parse(char *datablob, struct trusted_key_payload *p,
 		break;
 	case Opt_err:
 		return -EINVAL;
-		break;
 	}
 	return ret;
 }
security/safesetid/lsm.c +0 -3
index 8a176b6adbe5..1079c6d54784 100644
@@ -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;
 }
Signature · 1 line
2.18.1
maintainer Acked-by on v1 1/1
#2 lore raw
In reply to [email protected]
Quoted 5 lines · On Mon, 2020-10-19 at 10:36 -0700, [email protected] wrote:

From: Tom Rix <[email protected]>

A break is not needed if it is preceded by a return

Recently "fall through" comments were added before any case statement without a preceeding break. Have you made sure these changes won't be
flagged. Assuming you have,

Mimi