OSDN Git Service

rxrpc: Adjust /proc/net/rxrpc/calls to display call->debug_id not user_ID
authorDavid Howells <dhowells@redhat.com>
Sat, 2 May 2020 12:38:23 +0000 (13:38 +0100)
committerDavid Howells <dhowells@redhat.com>
Sun, 31 May 2020 14:19:51 +0000 (15:19 +0100)
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: David Howells <dhowells@redhat.com>
net/rxrpc/proc.c

index 8b179e3..543afd9 100644 (file)
@@ -68,7 +68,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
                         "Proto Local                                          "
                         " Remote                                         "
                         " 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;
        }
 
@@ -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);
        seq_printf(seq,
                   "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,
                   rbuff,
                   call->service_id,
@@ -110,7 +110,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
                   atomic_read(&call->usage),
                   rxrpc_call_states[call->state],
                   call->abort_code,
-                  call->user_call_ID,
+                  call->debug_id,
                   tx_hard_ack, READ_ONCE(call->tx_top) - tx_hard_ack,
                   rx_hard_ack, READ_ONCE(call->rx_top) - rx_hard_ack,
                   call->rx_serial,