lkml.org 
[lkml]   [2013]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.5 021/103] inet: fix possible seqlock deadlocks
    Date
    3.5.7.28 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Eric Dumazet <edumazet@google.com>

    commit f1d8cba61c3c4b1eb88e507249c4cb8d635d9a76 upstream.

    In commit c9e9042994d3 ("ipv4: fix possible seqlock deadlock") I left
    another places where IP_INC_STATS_BH() were improperly used.

    udp_sendmsg(), ping_v4_sendmsg() and tcp_v4_connect() are called from
    process context, not from softirq context.

    This was detected by lockdep seqlock support.

    Reported-by: jongman heo <jongman.heo@samsung.com>
    Fixes: 584bdf8cbdf6 ("[IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP")
    Fixes: c319b4d76b9e ("net: ipv4: add IPPROTO_ICMP socket kind")
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
    Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    net/ipv4/ping.c | 2 +-
    net/ipv4/tcp_ipv4.c | 2 +-
    net/ipv4/udp.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
    index 7207980..80c0847 100644
    --- a/net/ipv4/ping.c
    +++ b/net/ipv4/ping.c
    @@ -575,7 +575,7 @@ static int ping_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
    err = PTR_ERR(rt);
    rt = NULL;
    if (err == -ENETUNREACH)
    - IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);
    + IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);
    goto out;
    }

    diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
    index f374da4..03016d8 100644
    --- a/net/ipv4/tcp_ipv4.c
    +++ b/net/ipv4/tcp_ipv4.c
    @@ -184,7 +184,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
    if (IS_ERR(rt)) {
    err = PTR_ERR(rt);
    if (err == -ENETUNREACH)
    - IP_INC_STATS_BH(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
    + IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
    return err;
    }

    diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
    index fb9ebe9..2598686 100644
    --- a/net/ipv4/udp.c
    +++ b/net/ipv4/udp.c
    @@ -941,7 +941,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
    err = PTR_ERR(rt);
    rt = NULL;
    if (err == -ENETUNREACH)
    - IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);
    + IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);
    goto out;
    }

    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-17 20:41    [W:4.413 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site