Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecd0a6f8 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Greg Kroah-Hartman
Browse files

ima: Fix fall-through warnings for Clang 

[ Upstream commit 28073eb09c5aa29e879490edb88cfd3e7073821e ]

In preparation to enable -Wimplicit-fallthrough for Clang, fix multiple
warnings by explicitly adding multiple break statements instead of just
letting the code fall through to the next case.

Link: https://github.com/KSPP/linux/issues/115


Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Stable-dep-of: c7423dbdbc9e ("ima: Handle -ESTALE returned by ima_filter_rule_match()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 55e2430e

security/integrity/ima/ima_main.c

+1 −0
Original line number Diff line number Diff line
@@ -615,6 +615,7 @@ int ima_load_data(enum kernel_load_data_id id) 
			pr_err("impossible to appraise a module without a file descriptor. sig_enforce kernel parameter might help\n");

			return -EACCES;	/* INTEGRITY_UNKNOWN */

		}

		break;

	default:

		break;

	}

security/integrity/ima/ima_policy.c

+2 −0
Original line number Diff line number Diff line
@@ -434,6 +434,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, 
			rc = ima_filter_rule_match(secid, rule->lsm[i].type,

						   Audit_equal,

						   rule->lsm[i].rule);

			break;

		default:

			break;

		}
@@ -666,6 +667,7 @@ void __init ima_init_policy(void) 
		add_rules(default_measurement_rules,

			  ARRAY_SIZE(default_measurement_rules),

			  IMA_DEFAULT_POLICY);

		break;

	default:

		break;

	}