Commit 1b9beda8 authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland
Browse files

fs: dlm: fix build with CONFIG_IPV6 disabled 



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: default avatarkernel test robot <lkp@intel.com>
Fixes: 4c3d9057 ("fs: dlm: don't call kernel_getpeername() in error_report()")
Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 92c44605

fs/dlm/lowcomms.c

+2 −0
Original line number Diff line number Diff line
@@ -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, "