lkml.org 
[lkml]   [2018]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 040/100] rxrpc: Fix checks as to whether we should set up a new call
    Date
    From: David Howells <dhowells@redhat.com>

    [ Upstream commit dc71db34e4f3c06b8277c8f3c2ff014610607a8c ]

    There's a check in rxrpc_data_ready() that's checking the CLIENT_INITIATED
    flag in the packet type field rather than in the packet flags field.

    Fix this by creating a pair of helper functions to check whether the packet
    is going to the client or to the server and use them generally.

    Fixes: 248f219cb8bc ("rxrpc: Rewrite the data and ack handling code")
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/rxrpc/ar-internal.h | 10 ++++++++++
    net/rxrpc/conn_object.c | 2 +-
    net/rxrpc/input.c | 12 ++++--------
    3 files changed, 15 insertions(+), 9 deletions(-)

    diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
    index 707630ab4713..5069193d2cc1 100644
    --- a/net/rxrpc/ar-internal.h
    +++ b/net/rxrpc/ar-internal.h
    @@ -462,6 +462,16 @@ struct rxrpc_connection {
    u8 out_clientflag; /* RXRPC_CLIENT_INITIATED if we are client */
    };

    +static inline bool rxrpc_to_server(const struct rxrpc_skb_priv *sp)
    +{
    + return sp->hdr.flags & RXRPC_CLIENT_INITIATED;
    +}
    +
    +static inline bool rxrpc_to_client(const struct rxrpc_skb_priv *sp)
    +{
    + return !rxrpc_to_server(sp);
    +}
    +
    /*
    * Flags in call->flags.
    */
    diff --git a/net/rxrpc/conn_object.c b/net/rxrpc/conn_object.c
    index 4c77a78a252a..c37bf8e282b9 100644
    --- a/net/rxrpc/conn_object.c
    +++ b/net/rxrpc/conn_object.c
    @@ -99,7 +99,7 @@ struct rxrpc_connection *rxrpc_find_connection_rcu(struct rxrpc_local *local,
    k.epoch = sp->hdr.epoch;
    k.cid = sp->hdr.cid & RXRPC_CIDMASK;

    - if (sp->hdr.flags & RXRPC_CLIENT_INITIATED) {
    + if (rxrpc_to_server(sp)) {
    /* We need to look up service connections by the full protocol
    * parameter set. We look up the peer first as an intermediate
    * step and then the connection from the peer's tree.
    diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
    index 608d078a4981..338fbbf216a9 100644
    --- a/net/rxrpc/input.c
    +++ b/net/rxrpc/input.c
    @@ -1171,10 +1171,6 @@ void rxrpc_data_ready(struct sock *udp_sk)

    trace_rxrpc_rx_packet(sp);

    - _net("Rx RxRPC %s ep=%x call=%x:%x",
    - sp->hdr.flags & RXRPC_CLIENT_INITIATED ? "ToServer" : "ToClient",
    - sp->hdr.epoch, sp->hdr.cid, sp->hdr.callNumber);
    -
    if (sp->hdr.type >= RXRPC_N_PACKET_TYPES ||
    !((RXRPC_SUPPORTED_PACKET_TYPES >> sp->hdr.type) & 1)) {
    _proto("Rx Bad Packet Type %u", sp->hdr.type);
    @@ -1183,13 +1179,13 @@ void rxrpc_data_ready(struct sock *udp_sk)

    switch (sp->hdr.type) {
    case RXRPC_PACKET_TYPE_VERSION:
    - if (!(sp->hdr.flags & RXRPC_CLIENT_INITIATED))
    + if (rxrpc_to_client(sp))
    goto discard;
    rxrpc_post_packet_to_local(local, skb);
    goto out;

    case RXRPC_PACKET_TYPE_BUSY:
    - if (sp->hdr.flags & RXRPC_CLIENT_INITIATED)
    + if (rxrpc_to_server(sp))
    goto discard;
    /* Fall through */

    @@ -1269,7 +1265,7 @@ void rxrpc_data_ready(struct sock *udp_sk)
    call = rcu_dereference(chan->call);

    if (sp->hdr.callNumber > chan->call_id) {
    - if (!(sp->hdr.flags & RXRPC_CLIENT_INITIATED)) {
    + if (rxrpc_to_client(sp)) {
    rcu_read_unlock();
    goto reject_packet;
    }
    @@ -1292,7 +1288,7 @@ void rxrpc_data_ready(struct sock *udp_sk)
    }

    if (!call || atomic_read(&call->usage) == 0) {
    - if (!(sp->hdr.type & RXRPC_CLIENT_INITIATED) ||
    + if (rxrpc_to_client(sp) ||
    sp->hdr.callNumber == 0 ||
    sp->hdr.type != RXRPC_PACKET_TYPE_DATA)
    goto bad_message_unlock;
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-16 06:34    [W:4.038 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site