lkml.org 
[lkml]   [2019]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 144/243] net/x25: fix null_x25_address handling
    Date
    From: Martin Schiller <ms@dev.tdt.de>

    [ Upstream commit 06137619f061f498c2924f6543fa45b7d39f0501 ]

    o x25_find_listener(): the compare for the null_x25_address was wrong.
    We have to check the x25_addr of the listener socket instead of the
    x25_addr of the incomming call.

    o x25_bind(): it was not possible to bind a socket to null_x25_address

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/x25/af_x25.c | 16 ++++++++++------
    1 file changed, 10 insertions(+), 6 deletions(-)

    diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
    index 3150648206b68..20a511398389d 100644
    --- a/net/x25/af_x25.c
    +++ b/net/x25/af_x25.c
    @@ -288,7 +288,7 @@ static struct sock *x25_find_listener(struct x25_address *addr,
    sk_for_each(s, &x25_list)
    if ((!strcmp(addr->x25_addr,
    x25_sk(s)->source_addr.x25_addr) ||
    - !strcmp(addr->x25_addr,
    + !strcmp(x25_sk(s)->source_addr.x25_addr,
    null_x25_address.x25_addr)) &&
    s->sk_state == TCP_LISTEN) {
    /*
    @@ -685,11 +685,15 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
    goto out;
    }

    - len = strlen(addr->sx25_addr.x25_addr);
    - for (i = 0; i < len; i++) {
    - if (!isdigit(addr->sx25_addr.x25_addr[i])) {
    - rc = -EINVAL;
    - goto out;
    + /* check for the null_x25_address */
    + if (strcmp(addr->sx25_addr.x25_addr, null_x25_address.x25_addr)) {
    +
    + len = strlen(addr->sx25_addr.x25_addr);
    + for (i = 0; i < len; i++) {
    + if (!isdigit(addr->sx25_addr.x25_addr[i])) {
    + rc = -EINVAL;
    + goto out;
    + }
    }
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-11 16:22    [W:4.143 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site