[PATCH] rxrpc: remove duplicate 'error' variable

Subsystems: networking [general], rxrpc sockets (af_rxrpc), the rest

STALE3690d

3 messages, 2 authors, 2016-09-06 · open the first message on its own page

[PATCH] rxrpc: remove duplicate 'error' variable

From: Arnd Bergmann <arnd@arndb.de>
Date: 2016-09-06 13:25:54

The rxrpc_process_call function has debug code to print a failure code,
but instead of printing the code from the rxrpc_call structure, it
prints an uninitialized variable:

net/rxrpc/call_event.c: In function 'rxrpc_process_call':
net/rxrpc/call_event.c:879:58: error: 'error' may be used uninitialized in this function [-Werror=maybe-uninitialized]

This removes the extraneous variable and prints the correct
code instead.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: f5c17aaeb2ae ("rxrpc: Calls should only have one terminal state")
---
 net/rxrpc/call_event.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c
index de72de662044..4754c7fb6242 100644
--- a/net/rxrpc/call_event.c
+++ b/net/rxrpc/call_event.c
@@ -868,7 +868,6 @@ skip_msg_init:
 	/* deal with events of a final nature */
 	if (test_bit(RXRPC_CALL_EV_RCVD_ERROR, &call->events)) {
 		enum rxrpc_skb_mark mark;
-		int error;
 
 		clear_bit(RXRPC_CALL_EV_CONN_ABORT, &call->events);
 		clear_bit(RXRPC_CALL_EV_REJECT_BUSY, &call->events);
@@ -876,10 +875,10 @@ skip_msg_init:
 
 		if (call->completion == RXRPC_CALL_NETWORK_ERROR) {
 			mark = RXRPC_SKB_MARK_NET_ERROR;
-			_debug("post net error %d", error);
+			_debug("post net error %d", call->error);
 		} else {
 			mark = RXRPC_SKB_MARK_LOCAL_ERROR;
-			_debug("post net local error %d", error);
+			_debug("post net local error %d", call->error);
 		}
 
 		if (rxrpc_post_message(call, mark, call->error, true) < 0)
-- 
2.9.0

Re: [PATCH] rxrpc: remove duplicate 'error' variable

From: David Howells <dhowells@redhat.com>
Date: 2016-09-06 13:34:06

Arnd Bergmann [off-list ref] wrote:
The rxrpc_process_call function has debug code to print a failure code,
but instead of printing the code from the rxrpc_call structure, it
prints an uninitialized variable:

net/rxrpc/call_event.c: In function 'rxrpc_process_call':
net/rxrpc/call_event.c:879:58: error: 'error' may be used uninitialized in this function [-Werror=maybe-uninitialized]

This removes the extraneous variable and prints the correct
code instead.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: f5c17aaeb2ae ("rxrpc: Calls should only have one terminal state")
I've already posted a fix and it's waiting on DaveM.

https://patchwork.ozlabs.org/patch/665550/

http://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-fs.git/commit/?h=rxrpc-rewrite&id=00b5407e427ac2588a2496b92035a94602b3cd1b

David

Re: [PATCH] rxrpc: remove duplicate 'error' variable

From: Arnd Bergmann <arnd@arndb.de>
Date: 2016-09-06 13:39:40

On Tuesday, September 6, 2016 2:34:02 PM CEST David Howells wrote:
Arnd Bergmann [off-list ref] wrote:
quoted
The rxrpc_process_call function has debug code to print a failure code,
but instead of printing the code from the rxrpc_call structure, it
prints an uninitialized variable:

net/rxrpc/call_event.c: In function 'rxrpc_process_call':
net/rxrpc/call_event.c:879:58: error: 'error' may be used uninitialized in this function [-Werror=maybe-uninitialized]

This removes the extraneous variable and prints the correct
code instead.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: f5c17aaeb2ae ("rxrpc: Calls should only have one terminal state")
I've already posted a fix and it's waiting on DaveM.

https://patchwork.ozlabs.org/patch/665550/

http://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-fs.git/commit/?h=rxrpc-rewrite&id=00b5407e427ac2588a2496b92035a94602b3cd1b
Ok, good. At least I'm glad my patch is correct this time (being identical
to yours).

	Arnd
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help