security: keys: annotate implicit fall through
Subsystems (2)
PATCH 1/3 security: keys: annotate implicit fall through
There is a plan to build the kernel with -Wimplicit-fallthrough and this place in the code produced a warning (W=1).
This commit remove the following warning:
security/keys/keyring.c:248:10: warning: this statement may fall through [-Wimplicit-fallthrough=]
--- security/keys/keyring.c | 1 + 1 file changed, 1 insertion(+)
security/keys/keyring.c +1 -0
@@ -246,6 +246,7 @@ static unsigned long keyring_get_key_chunk(const void *data, int level) (ASSOC_ARRAY_KEY_CHUNK_SIZE - 8)); n--; offset =1 ; +/* fall through */ default : offset +=sizeof (chunk) -1 ; offset += (level -3 ) *sizeof (chunk);
Signature · 1 line
2.19.2
PATCH 2/3 security: keys: annotate implicit fall throughs
There is a plan to build the kernel with -Wimplicit-fallthrough and these places in the code produced warnings (W=1). Fix them up.
This commit remove the following warning:
security/keys/process_keys.c:380:7: warning: this statement may fall through [-Wimplicit-fallthrough=] security/keys/process_keys.c:404:7: warning: this statement may fall through [-Wimplicit-fallthrough=] security/keys/process_keys.c:424:7: warning: this statement may fall through [-Wimplicit-fallthrough=]
--- security/keys/process_keys.c | 3 +++ 1 file changed, 3 insertions(+)
security/keys/process_keys.c +3 -0
@@ -379,6 +379,7 @@ key_ref_t search_my_process_keyrings(struct keyring_search_context *ctx)case -EAGAIN :/* no key */ if (ret)break ; +/* fall through */ case -ENOKEY :/* negative key */ ret = key_ref;break ;
@@ -403,6 +404,7 @@ key_ref_t search_my_process_keyrings(struct keyring_search_context *ctx)case -EAGAIN :/* no key */ if (ret)break ; +/* fall through */ case -ENOKEY :/* negative key */ ret = key_ref;break ;
@@ -423,6 +425,7 @@ key_ref_t search_my_process_keyrings(struct keyring_search_context *ctx)case -EAGAIN :/* no key */ if (ret)break ; +/* fall through */ case -ENOKEY :/* negative key */ ret = key_ref;break ;
Signature · 1 line
2.19.2
PATCH 3/3 security: keys: annotate implicit fall throughs
In reply to Mathieu MalaterreThere is a plan to build the kernel with -Wimplicit-fallthrough and these places in the code produced warnings (W=1). Fix them up.
This commit remove the following warnings:
security/keys/request_key.c:293:7: warning: this statement may fall through [-Wimplicit-fallthrough=] security/keys/request_key.c:298:7: warning: this statement may fall through [-Wimplicit-fallthrough=] security/keys/request_key.c:307:7: warning: this statement may fall through [-Wimplicit-fallthrough=]
--- security/keys/request_key.c | 4 ++++ 1 file changed, 4 insertions(+)
security/keys/request_key.c +4 -0
@@ -287,16 +287,19 @@ static int construct_get_dest_keyring(struct key **_dest_keyring) } } +/* fall through */ case KEY_REQKEY_DEFL_THREAD_KEYRING : dest_keyring =key_get (cred->thread_keyring);if (dest_keyring)break ; +/* fall through */ case KEY_REQKEY_DEFL_PROCESS_KEYRING : dest_keyring =key_get (cred->process_keyring);if (dest_keyring)break ; +/* fall through */ case KEY_REQKEY_DEFL_SESSION_KEYRING :rcu_read_lock (); dest_keyring = key_get(
@@ -306,6 +309,7 @@ static int construct_get_dest_keyring(struct key **_dest_keyring)if (dest_keyring)break ; +/* fall through */ case KEY_REQKEY_DEFL_USER_SESSION_KEYRING: dest_keyring key_get(cred->user->session_keyring);
Signature · 1 line
2.19.2
James Morris
maintainerQuoted 8 lines · Mathieu Malaterre
There is a plan to build the kernel with -Wimplicit-fallthrough and this place in the code produced a warning (W=1).
This commit remove the following warning:
security/keys/keyring.c:248:10: warning: this statement may fall through [-Wimplicit-fallthrough=]Signed-off-by Mathieu Malaterre <[email protected]>
All 3 applied togit://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-general
Signature · 2 lines
James Morris <[email protected]>