security: mark expected switch fall-throughs and add a missing break
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through. This patch fixes the following warnings: security/integrity/ima/ima_template_lib.c:85:10: warning: this statement may fall through [-Wimplicit-fallthrough=] security/integrity/ima/ima_policy.c:940:18: warning: this statement may fall through [-Wimplicit-fallthrough=] security/integrity/ima/ima_policy.c:943:7: warning: this statement may fall through [-Wimplicit-fallthrough=] security/integrity/ima/ima_policy.c:972:21: warning: this statement may fall through [-Wimplicit-fallthrough=] security/integrity/ima/ima_policy.c:974:7: warning: this statement may fall through [-Wimplicit-fallthrough=] security/smack/smack_lsm.c:3391:9: warning: this statement may fall through [-Wimplicit-fallthrough=] security/apparmor/domain.c:569:6: warning: this statement may fall through [-Wimplicit-fallthrough=] Warning level 3 was used: -Wimplicit-fallthrough=3 Also, add a missing break statement to fix the following warning: security/integrity/ima/ima_appraise.c:116:26: warning: this statement may fall through [-Wimplicit-fallthrough=] Acked-by: John Johansen <john.johansen@canonical.com> Acked-by: Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Acked-by: Mimi Zohar <zohar@linux.ibm.com> Signed-off-by: James Morris <james.morris@microsoft.com>hifive-unleashed-5.1
parent
861f4bcffc
commit
09186e5034
|
@ -572,7 +572,7 @@ static struct aa_label *x_to_label(struct aa_profile *profile,
|
||||||
stack = NULL;
|
stack = NULL;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* fall through to X_NAME */
|
/* fall through - to X_NAME */
|
||||||
case AA_X_NAME:
|
case AA_X_NAME:
|
||||||
if (xindex & AA_X_CHILD)
|
if (xindex & AA_X_CHILD)
|
||||||
/* released by caller */
|
/* released by caller */
|
||||||
|
|
|
@ -114,6 +114,7 @@ static void ima_set_cache_status(struct integrity_iint_cache *iint,
|
||||||
break;
|
break;
|
||||||
case CREDS_CHECK:
|
case CREDS_CHECK:
|
||||||
iint->ima_creds_status = status;
|
iint->ima_creds_status = status;
|
||||||
|
break;
|
||||||
case FILE_CHECK:
|
case FILE_CHECK:
|
||||||
case POST_SETATTR:
|
case POST_SETATTR:
|
||||||
iint->ima_file_status = status;
|
iint->ima_file_status = status;
|
||||||
|
|
|
@ -938,10 +938,12 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
|
||||||
case Opt_uid_gt:
|
case Opt_uid_gt:
|
||||||
case Opt_euid_gt:
|
case Opt_euid_gt:
|
||||||
entry->uid_op = &uid_gt;
|
entry->uid_op = &uid_gt;
|
||||||
|
/* fall through */
|
||||||
case Opt_uid_lt:
|
case Opt_uid_lt:
|
||||||
case Opt_euid_lt:
|
case Opt_euid_lt:
|
||||||
if ((token == Opt_uid_lt) || (token == Opt_euid_lt))
|
if ((token == Opt_uid_lt) || (token == Opt_euid_lt))
|
||||||
entry->uid_op = &uid_lt;
|
entry->uid_op = &uid_lt;
|
||||||
|
/* fall through */
|
||||||
case Opt_uid_eq:
|
case Opt_uid_eq:
|
||||||
case Opt_euid_eq:
|
case Opt_euid_eq:
|
||||||
uid_token = (token == Opt_uid_eq) ||
|
uid_token = (token == Opt_uid_eq) ||
|
||||||
|
@ -970,9 +972,11 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
|
||||||
break;
|
break;
|
||||||
case Opt_fowner_gt:
|
case Opt_fowner_gt:
|
||||||
entry->fowner_op = &uid_gt;
|
entry->fowner_op = &uid_gt;
|
||||||
|
/* fall through */
|
||||||
case Opt_fowner_lt:
|
case Opt_fowner_lt:
|
||||||
if (token == Opt_fowner_lt)
|
if (token == Opt_fowner_lt)
|
||||||
entry->fowner_op = &uid_lt;
|
entry->fowner_op = &uid_lt;
|
||||||
|
/* fall through */
|
||||||
case Opt_fowner_eq:
|
case Opt_fowner_eq:
|
||||||
ima_log_string_op(ab, "fowner", args[0].from,
|
ima_log_string_op(ab, "fowner", args[0].from,
|
||||||
entry->fowner_op);
|
entry->fowner_op);
|
||||||
|
|
|
@ -83,6 +83,7 @@ static void ima_show_template_data_ascii(struct seq_file *m,
|
||||||
/* skip ':' and '\0' */
|
/* skip ':' and '\0' */
|
||||||
buf_ptr += 2;
|
buf_ptr += 2;
|
||||||
buflen -= buf_ptr - field_data->data;
|
buflen -= buf_ptr - field_data->data;
|
||||||
|
/* fall through */
|
||||||
case DATA_FMT_DIGEST:
|
case DATA_FMT_DIGEST:
|
||||||
case DATA_FMT_HEX:
|
case DATA_FMT_HEX:
|
||||||
if (!buflen)
|
if (!buflen)
|
||||||
|
|
|
@ -3293,13 +3293,12 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
|
||||||
*/
|
*/
|
||||||
final = &smack_known_star;
|
final = &smack_known_star;
|
||||||
/*
|
/*
|
||||||
* Fall through.
|
|
||||||
*
|
|
||||||
* If a smack value has been set we want to use it,
|
* If a smack value has been set we want to use it,
|
||||||
* but since tmpfs isn't giving us the opportunity
|
* but since tmpfs isn't giving us the opportunity
|
||||||
* to set mount options simulate setting the
|
* to set mount options simulate setting the
|
||||||
* superblock default.
|
* superblock default.
|
||||||
*/
|
*/
|
||||||
|
/* Fall through */
|
||||||
default:
|
default:
|
||||||
/*
|
/*
|
||||||
* This isn't an understood special case.
|
* This isn't an understood special case.
|
||||||
|
|
Loading…
Reference in New Issue