Commit 8ffd7ba9 authored Jul 02, 2019 by Stephen Hemminger Committed by Greg Kroah-Hartman Oct 01, 2019

net: don't warn in inet diag when IPV6 is disabled

[ 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: 432490f9 ("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>

parent ff0fbfac

net/ipv4/raw_diag.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -23,9 +23,6 @@ raw_get_hashinfo(const struct inet_diag_req_v2 *r)
	return &raw_v6_hashinfo;		return &raw_v6_hashinfo;
	#endif		#endif
	} else {		} else {
	pr_warn_once("Unexpected inet family %d\n",
	r->sdiag_family);
	WARN_ON_ONCE(1);
	return ERR_PTR(-EINVAL);		return ERR_PTR(-EINVAL);
	}		}
	}		}