lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 132/846] fs: dlm: fix build with CONFIG_IPV6 disabled
    Date
    From: Alexander Aring <aahringo@redhat.com>

    [ Upstream commit 1b9beda83e27a0c2cd75d1cb743c297c7b36c844 ]

    This patch will surround the AF_INET6 case in sk_error_report() of dlm
    with a #if IS_ENABLED(CONFIG_IPV6). The field sk->sk_v6_daddr is not
    defined when CONFIG_IPV6 is disabled. If CONFIG_IPV6 is disabled, the
    socket creation with AF_INET6 should already fail because a runtime
    check if AF_INET6 is registered. However if there is the possibility
    that AF_INET6 is set as sk_family the sk_error_report() callback will
    print then an invalid family type error.

    Reported-by: kernel test robot <lkp@intel.com>
    Fixes: 4c3d90570bcc ("fs: dlm: don't call kernel_getpeername() in error_report()")
    Signed-off-by: Alexander Aring <aahringo@redhat.com>
    Signed-off-by: David Teigland <teigland@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/dlm/lowcomms.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
    index 7b1c5f05a988b..7a8efce1c343e 100644
    --- a/fs/dlm/lowcomms.c
    +++ b/fs/dlm/lowcomms.c
    @@ -612,6 +612,7 @@ static void lowcomms_error_report(struct sock *sk)
    ntohs(inet->inet_dport), sk->sk_err,
    sk->sk_err_soft);
    break;
    +#if IS_ENABLED(CONFIG_IPV6)
    case AF_INET6:
    printk_ratelimited(KERN_ERR "dlm: node %d: socket error "
    "sending to node %d at %pI6c, "
    @@ -620,6 +621,7 @@ static void lowcomms_error_report(struct sock *sk)
    ntohs(inet->inet_dport), sk->sk_err,
    sk->sk_err_soft);
    break;
    +#endif
    default:
    printk_ratelimited(KERN_ERR "dlm: node %d: socket error "
    "invalid socket family %d set, "
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:09    [W:2.059 / U:0.656 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site