lkml.org 
[lkml]   [2019]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 36/45] net: dont warn in inet diag when IPV6 is disabled
    Date
    From: Stephen Hemminger <stephen@networkplumber.org>

    [ Upstream commit 1e64d7cbfdce4887008314d5b367209582223f27 ]

    If IPV6 was disabled, then ss command would cause a kernel warning
    because the command was attempting to dump IPV6 socket information.
    The fix is to just remove the warning.

    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202249
    Fixes: 432490f9d455 ("net: ip, diag -- Add diag interface for raw sockets")
    Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/ipv4/raw_diag.c | 3 ---
    1 file changed, 3 deletions(-)

    diff --git a/net/ipv4/raw_diag.c b/net/ipv4/raw_diag.c
    index 899e34ceb5602..e35736b993003 100644
    --- a/net/ipv4/raw_diag.c
    +++ b/net/ipv4/raw_diag.c
    @@ -24,9 +24,6 @@ raw_get_hashinfo(const struct inet_diag_req_v2 *r)
    return &raw_v6_hashinfo;
    #endif
    } else {
    - pr_warn_once("Unexpected inet family %d\n",
    - r->sdiag_family);
    - WARN_ON_ONCE(1);
    return ERR_PTR(-EINVAL);
    }
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-09-29 16:03    [W:2.164 / U:0.528 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site