From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB106C32793 for ; Sun, 29 Sep 2019 14:02:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 784E121906 for ; Sun, 29 Sep 2019 14:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569765747; bh=cRcNa+IPSu9O6oUe7TD+cvUBa7ZY+zVpPPKdob/HPKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iyk59a4PK2RM4WpB3Sx35eZeTqSg1+3r2F8P6Q85qyesm/6GQQ2btgUSMDopIaPQ2 EjPb7jyeZx8jJ6Hpv6WfemankmObFACAkKAIpfj6WKTHg7wQLONoKsIwA7+v0mHLal kGXrNYVhbqgIAV6iqS7qSHfQ4P1xtHW3VNOiPaaM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730198AbfI2OCW (ORCPT ); Sun, 29 Sep 2019 10:02:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:45000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730194AbfI2OCW (ORCPT ); Sun, 29 Sep 2019 10:02:22 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0A73221835; Sun, 29 Sep 2019 14:02:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569765741; bh=cRcNa+IPSu9O6oUe7TD+cvUBa7ZY+zVpPPKdob/HPKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nsuAVLN4A6omUDmL93oM5csYoTId3VEr9MY+UGnuY03qWbSgbSXN6EbwemHFG1S1A YWgArlM9WhhN7gsLKE+VGdh56P+K4yLuojq/miOucAFp5Zs8F3ihe0EVxew66pCl16 FQX3yyAqdhZLZag21jUHGkN//umdLRmLm+2MxBmk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stephen Hemminger , "David S. Miller" , Sasha Levin Subject: [PATCH 5.2 36/45] net: dont warn in inet diag when IPV6 is disabled Date: Sun, 29 Sep 2019 15:56:04 +0200 Message-Id: <20190929135032.777210777@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190929135024.387033930@linuxfoundation.org> References: <20190929135024.387033930@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stephen Hemminger [ 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- 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