]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
security: keys: annotate implicit fall throughs
authorMathieu Malaterre <malat@debian.org>
Mon, 14 Jan 2019 20:17:25 +0000 (21:17 +0100)
committerJames Morris <james.morris@microsoft.com>
Wed, 23 Jan 2019 03:47:47 +0000 (19:47 -0800)
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 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=]

Signed-off-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: James Morris <james.morris@microsoft.com>
security/keys/request_key.c

index 301f0e300dbd28d1557e875e68899e133315cfbd..af8816ffb6cec59464df1d357de29800b2f41eff 100644 (file)
@@ -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);