All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] security: keys: annotate implicit fall through
@ 2019-01-14 20:17 ` Mathieu Malaterre
  0 siblings, 0 replies; 8+ messages in thread
From: Mathieu Malaterre @ 2019-01-14 20:17 UTC (permalink / raw)
  To: David Howells
  Cc: Mathieu Malaterre, James Morris, Serge E. Hallyn, keyrings,
	linux-security-module, linux-kernel

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 <malat@debian.org>
---
 security/keys/keyring.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index eadebb92986a..b1ff07d9ce37 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -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);
-- 
2.19.2

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 1/3] security: keys: annotate implicit fall through
@ 2019-01-14 20:17 ` Mathieu Malaterre
  0 siblings, 0 replies; 8+ messages in thread
From: Mathieu Malaterre @ 2019-01-14 20:17 UTC (permalink / raw)
  To: David Howells
  Cc: Mathieu Malaterre, James Morris, Serge E. Hallyn, keyrings,
	linux-security-module, linux-kernel

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 <malat@debian.org>
---
 security/keys/keyring.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index eadebb92986a..b1ff07d9ce37 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -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);
-- 
2.19.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 2/3] security: keys: annotate implicit fall throughs
  2019-01-14 20:17 ` Mathieu Malaterre
@ 2019-01-14 20:17   ` Mathieu Malaterre
  -1 siblings, 0 replies; 8+ messages in thread
From: Mathieu Malaterre @ 2019-01-14 20:17 UTC (permalink / raw)
  To: David Howells
  Cc: Mathieu Malaterre, James Morris, Serge E. Hallyn, keyrings,
	linux-security-module, linux-kernel

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=]

Signed-off-by: Mathieu Malaterre <malat@debian.org>
---
 security/keys/process_keys.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 02c77e928f68..3308d738734c 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -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;
-- 
2.19.2

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 2/3] security: keys: annotate implicit fall throughs
@ 2019-01-14 20:17   ` Mathieu Malaterre
  0 siblings, 0 replies; 8+ messages in thread
From: Mathieu Malaterre @ 2019-01-14 20:17 UTC (permalink / raw)
  To: David Howells
  Cc: Mathieu Malaterre, James Morris, Serge E. Hallyn, keyrings,
	linux-security-module, linux-kernel

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=]

Signed-off-by: Mathieu Malaterre <malat@debian.org>
---
 security/keys/process_keys.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 02c77e928f68..3308d738734c 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -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;
-- 
2.19.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 3/3] security: keys: annotate implicit fall throughs
  2019-01-14 20:17 ` Mathieu Malaterre
@ 2019-01-14 20:17   ` Mathieu Malaterre
  -1 siblings, 0 replies; 8+ messages in thread
From: Mathieu Malaterre @ 2019-01-14 20:17 UTC (permalink / raw)
  To: David Howells
  Cc: Mathieu Malaterre, James Morris, Serge E. Hallyn, keyrings,
	linux-security-module, linux-kernel

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>
---
 security/keys/request_key.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 301f0e300dbd..af8816ffb6ce 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -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);
-- 
2.19.2

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 3/3] security: keys: annotate implicit fall throughs
@ 2019-01-14 20:17   ` Mathieu Malaterre
  0 siblings, 0 replies; 8+ messages in thread
From: Mathieu Malaterre @ 2019-01-14 20:17 UTC (permalink / raw)
  To: David Howells
  Cc: Mathieu Malaterre, James Morris, Serge E. Hallyn, keyrings,
	linux-security-module, linux-kernel

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>
---
 security/keys/request_key.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 301f0e300dbd..af8816ffb6ce 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -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);
-- 
2.19.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] security: keys: annotate implicit fall through
  2019-01-14 20:17 ` Mathieu Malaterre
@ 2019-01-23  4:38   ` James Morris
  -1 siblings, 0 replies; 8+ messages in thread
From: James Morris @ 2019-01-23  4:38 UTC (permalink / raw)
  To: Mathieu Malaterre
  Cc: David Howells, Serge E. Hallyn, keyrings, linux-security-module,
	linux-kernel

On Mon, 14 Jan 2019, Mathieu Malaterre wrote:

> 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 <malat@debian.org>

All 3 applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-general


-- 
James Morris
<jmorris@namei.org>

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] security: keys: annotate implicit fall through
@ 2019-01-23  4:38   ` James Morris
  0 siblings, 0 replies; 8+ messages in thread
From: James Morris @ 2019-01-23  4:38 UTC (permalink / raw)
  To: Mathieu Malaterre
  Cc: David Howells, Serge E. Hallyn, keyrings, linux-security-module,
	linux-kernel

On Mon, 14 Jan 2019, Mathieu Malaterre wrote:

> 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 <malat@debian.org>

All 3 applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-general


-- 
James Morris
<jmorris@namei.org>


^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-01-23  4:38 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-14 20:17 [PATCH 1/3] security: keys: annotate implicit fall through Mathieu Malaterre
2019-01-14 20:17 ` Mathieu Malaterre
2019-01-14 20:17 ` [PATCH 2/3] security: keys: annotate implicit fall throughs Mathieu Malaterre
2019-01-14 20:17   ` Mathieu Malaterre
2019-01-14 20:17 ` [PATCH 3/3] " Mathieu Malaterre
2019-01-14 20:17   ` Mathieu Malaterre
2019-01-23  4:38 ` [PATCH 1/3] security: keys: annotate implicit fall through James Morris
2019-01-23  4:38   ` James Morris

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.