Commit 32f71aa4 authored by David Howells's avatar David Howells

rxrpc: Adjust /proc/net/rxrpc/calls to display call->debug_id not user_ID

The user ID value isn't actually much use - and leaks a kernel pointer or a
userspace value - so replace it with the call debug ID, which appears in trace
points.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 23e2db31
...@@ -68,7 +68,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v) ...@@ -68,7 +68,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
"Proto Local " "Proto Local "
" Remote " " Remote "
" SvID ConnID CallID End Use State Abort " " SvID ConnID CallID End Use State Abort "
" UserID TxSeq TW RxSeq RW RxSerial RxTimo\n"); " DebugId TxSeq TW RxSeq RW RxSerial RxTimo\n");
return 0; return 0;
} }
...@@ -100,7 +100,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v) ...@@ -100,7 +100,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
rx_hard_ack = READ_ONCE(call->rx_hard_ack); rx_hard_ack = READ_ONCE(call->rx_hard_ack);
seq_printf(seq, seq_printf(seq,
"UDP %-47.47s %-47.47s %4x %08x %08x %s %3u" "UDP %-47.47s %-47.47s %4x %08x %08x %s %3u"
" %-8.8s %08x %lx %08x %02x %08x %02x %08x %06lx\n", " %-8.8s %08x %08x %08x %02x %08x %02x %08x %06lx\n",
lbuff, lbuff,
rbuff, rbuff,
call->service_id, call->service_id,
...@@ -110,7 +110,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v) ...@@ -110,7 +110,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
atomic_read(&call->usage), atomic_read(&call->usage),
rxrpc_call_states[call->state], rxrpc_call_states[call->state],
call->abort_code, call->abort_code,
call->user_call_ID, call->debug_id,
tx_hard_ack, READ_ONCE(call->tx_top) - tx_hard_ack, tx_hard_ack, READ_ONCE(call->tx_top) - tx_hard_ack,
rx_hard_ack, READ_ONCE(call->rx_top) - rx_hard_ack, rx_hard_ack, READ_ONCE(call->rx_top) - rx_hard_ack,
call->rx_serial, call->rx_serial,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment