From patchwork Mon Jul 1 15:23:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 1125420 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=networkplumber.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="x/wSF7a4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45crjS73V7z9s4Y for ; Tue, 2 Jul 2019 01:23:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728189AbfGAPXH (ORCPT ); Mon, 1 Jul 2019 11:23:07 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:43714 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727312AbfGAPXH (ORCPT ); Mon, 1 Jul 2019 11:23:07 -0400 Received: by mail-pl1-f196.google.com with SMTP id cl9so7511603plb.10 for ; Mon, 01 Jul 2019 08:23:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Vo5JVl/0iUs0czPYtgeWaa8Uzyp8tFbop9NRDH9nJIk=; b=x/wSF7a4XlMkJmrWRnXL+B9kljSXAaelnHyp019g0prUMw10URvvge0KyeNmPGf9VW mb1HlfxR7nAIU6xru8zk6q+jIodHybQKeFTJk19VAiJ51UozCEJViOyFcGchZoFB8T8b zjcUwKD4XWBGOlacZwKlDsHPqKLDqGCj0HvW/ABdy1OJ6JTU9DWZdcQh5iWXYJNCUA+n EKjWwt9k0pLxbNV6+PIdQicBBjQiXl8dE7RwwNN1JRn8h78B5jvesXYMxeqY4LPh4T93 H/KJNj6b8eGTdujgyrZsDf5OOQcdsMuzMsjzSjq11SrPo8fK0ICaE+aG9ibwtU9I+/rs 83rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Vo5JVl/0iUs0czPYtgeWaa8Uzyp8tFbop9NRDH9nJIk=; b=acsTFbk4TE8GLOmDLRICp+OBMjnv3wVPG/pX8Xudmu4o7INxQJnpvyZBvXu9itFIde ABTnqTrRBbV6RWdqtJn65VB3PN8HNcwCno7s95/mWlmCTs0KhDLW6x9DxiAL6RgFjiTZ R9+ZT+BdImhK2qvav2/HXPCivcy8xd2s9Vk022XdZPws439hqZxPCYVNiAPVjOAbJxmx hUylWpIgbsonyUOisl2ZgoKRJbWTWWvB+hE9dVo8cKFjZoSCYZ2DMBINMX61OEy40OZm jw33/lbGdmCgbZEruNYDqxzNxmgKS7gfufQW/i2kNZwCjTF2C3dwKBfmiHYoo2VOUgAj tUpg== X-Gm-Message-State: APjAAAUWsnwinh/3CFKuB9+gcgnIhrk+Jd4AgM30gbspeDuuf+vp0vIf GpN7aJJ/IxapnzQRxPXrtMVsujQqtL4= X-Google-Smtp-Source: APXvYqyfF62FxLBpnsbFeiNEAjvcJc3MJgvBAz4nP644mPfIfLpxPSBMXqOeYmkVbyGJ5pAvFtQEvw== X-Received: by 2002:a17:902:583:: with SMTP id f3mr29391933plf.137.1561994586341; Mon, 01 Jul 2019 08:23:06 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id n7sm12342353pff.59.2019.07.01.08.23.05 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 01 Jul 2019 08:23:05 -0700 (PDT) From: Stephen Hemminger To: davem@davemloft.net, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org Cc: netdev@vger.kernel.org, Stephen Hemminger Subject: [PATCH net] net: don't warn in inet diag when IPV6 is disabled Date: Mon, 1 Jul 2019 08:23:03 -0700 Message-Id: <20190701152303.4031-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If IPV6 was disabled, then ss command would cause a kernel warning because the command was attempting to dump IPV6 socke information. This should not be a warning, instead just return a normal error code. 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 --- net/ipv4/raw_diag.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/ipv4/raw_diag.c b/net/ipv4/raw_diag.c index 899e34ceb560..045485d39f23 100644 --- a/net/ipv4/raw_diag.c +++ b/net/ipv4/raw_diag.c @@ -19,9 +19,11 @@ raw_get_hashinfo(const struct inet_diag_req_v2 *r) { if (r->sdiag_family == AF_INET) { return &raw_v4_hashinfo; -#if IS_ENABLED(CONFIG_IPV6) } else if (r->sdiag_family == AF_INET6) { +#if IS_ENABLED(CONFIG_IPV6) return &raw_v6_hashinfo; +#else + return ERR_PTR(-EOPNOTSUPP); #endif } else { pr_warn_once("Unexpected inet family %d\n",