lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 207/314] rxrpc: Adjust /proc/net/rxrpc/calls to display call->debug_id not user_ID
    Date
    From: David Howells <dhowells@redhat.com>

    [ Upstream commit 32f71aa497cfb23d37149c2ef16ad71fce2e45e2 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/rxrpc/proc.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/net/rxrpc/proc.c b/net/rxrpc/proc.c
    index 8b179e3c802a1..543afd9bd6642 100644
    --- a/net/rxrpc/proc.c
    +++ b/net/rxrpc/proc.c
    @@ -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,
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:31    [W:4.725 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site