fs: dlm: fix build with CONFIG_IPV6 disabled
authorAlexander Aring <aahringo@redhat.com>
Wed, 17 Nov 2021 14:20:43 +0000 (09:20 -0500)
committerDavid Teigland <teigland@redhat.com>
Wed, 17 Nov 2021 14:46:23 +0000 (08:46 -0600)
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>
fs/dlm/lowcomms.c

index 203470189011102d111318ac233b45e36b54e2a4..f7fc1ac76ce83a5f250852f70783df2e724df5d1 100644 (file)
@@ -608,6 +608,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, "
@@ -616,6 +617,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, "