Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2509848pxb; Mon, 19 Apr 2021 07:24:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnDscQYrr85sxVGfljTF3dFp5/OqJl13v3Kopp5BmpWQPVLIkYqLb0Y9EvXzHo1mw5CSsq X-Received: by 2002:a05:6402:40d5:: with SMTP id z21mr26328149edb.20.1618842276835; Mon, 19 Apr 2021 07:24:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842276; cv=none; d=google.com; s=arc-20160816; b=hJ/LIYeKf5NqQyaBs91lzCf8JuCmCK3ifAqP1110cAucA7slgNreVUhnGEZvx5kbNh YhuvMPkudfza5QbqzB2DsGp/uZVI6Fdih763PxFt5HdW8Oh8Ywx966BmArffGDymfW/q vhlyY5T4yKe0uG7EI9p49jqjuOoSdL23KzXuOQQXvMt40gjtVNFemWIp3WNVVayFF0VP NksUGv6KBX+JkwfrEUx4nGI2NRYorRXNa3Nv5FcQsOkDa06EPGAo3wIGFPy3g2MeatkW EW1KZyt7SeaKwkZwixZR5LacY4EyPrCDWlC0d3cp0aOa3fT5dZ6E+rFtU6uqeIboYoUq Zkbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IDVMXX8B7oYqVdwn1Th2sRYwp/0tt7Nhato3sC7UwTk=; b=SZEgCTXtvY99tDFGh5bKs8zkQB1GS1c/EOCXUpVx9Xf+t9/7DAmQvkvupbuVikMsjg DUB7JAOwb127C0XJlV85f73tgxeYZA49xdgkG/lMqW3hsxgsRP+yeOuUmCOidORMb77j ktz9lUs8Pi9/JuJglj8kWhdlWh3nZqg7FGdJRr89nqPQdmn0HNPakb0t/FOUv2d8Qwh8 222ZnoQX8OYVR8HTud2J8+b2KOm2KhxAQnomwLQk8kTXDv/FjgMz6o7BDEb91hGhrk4c oQTG/ikIHXmtw6se6uhYt9+M3QHGiai4xKQPyF11aUdGGSxlEYHWnrSFmJF9Re0+gwwf Iz8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=trVObqUt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id kw24si11705694ejc.336.2021.04.19.07.24.13; Mon, 19 Apr 2021 07:24:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=trVObqUt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240157AbhDSNMt (ORCPT + 99 others); Mon, 19 Apr 2021 09:12:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:45438 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238717AbhDSNLG (ORCPT ); Mon, 19 Apr 2021 09:11:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 546D5613AA; Mon, 19 Apr 2021 13:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618837835; bh=ejUAZqMGKPGXwEmklG9FMFdemyZwfc4HRXSxVzTuR08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=trVObqUt2OE2Wb96uL43dF8PedF8DEJkSmzxM3zNdHAME09oPGAjl+9uVJ/xdzJFX TEsjX1qPdXDP8CE2qh9OPda4K5OkwngxxvdEqNHVlciFCfl47ejFXLWc7NNZCaMZi2 ISqjAWfj+SHiziT29DweoPGUFf3yLySZ85ztG44c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pablo Neira Ayuso Subject: [PATCH 5.11 072/122] netfilter: conntrack: do not print icmpv6 as unknown via /proc Date: Mon, 19 Apr 2021 15:05:52 +0200 Message-Id: <20210419130532.619908826@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130530.166331793@linuxfoundation.org> References: <20210419130530.166331793@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pablo Neira Ayuso commit fbea31808ca124dd73ff6bb1e67c9af4607c3e32 upstream. /proc/net/nf_conntrack shows icmpv6 as unknown. Fixes: 09ec82f5af99 ("netfilter: conntrack: remove protocol name from l4proto struct") Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nf_conntrack_standalone.c | 1 + 1 file changed, 1 insertion(+) --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -266,6 +266,7 @@ static const char* l4proto_name(u16 prot case IPPROTO_GRE: return "gre"; case IPPROTO_SCTP: return "sctp"; case IPPROTO_UDPLITE: return "udplite"; + case IPPROTO_ICMPV6: return "icmpv6"; } return "unknown";