Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2574299pxb; Mon, 19 Apr 2021 08:44:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQ8VSuL/yfoUk4xEZaXMjgHXd+BGcKU1rrNtRIDxJvouO1XM5YFJEAwoMVdUBOBm7LFRYR X-Received: by 2002:a17:906:8293:: with SMTP id h19mr22657366ejx.217.1618847057765; Mon, 19 Apr 2021 08:44:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618847057; cv=none; d=google.com; s=arc-20160816; b=U5UbGeyTG0h1ZDhsCmd+6Xv00Q20hAW+5x3PwNPS63JxrZJYWdUTpFiKq5opAOK5c5 PXSBDT4p0jUHZ8y2JJuyONB/Mf82eqosHHi0ctqS/WzkSqbHLexkJPn/32ia3nro+Gkn KM83C9s37fRQVAZY7erk7NRlJXJOLfbWoSKnXFVKDFCEZgBPmar7NLv/wQXJAymCcd6e zDOvXCmx04f4owlLvGCKWOFZkwZyjTozgtsO4aug65wGRC2CgowuzXrb+gYHWdE90v5d EN5V+uQqECxW9bitaNZMFBnLC5vQWdQbLSwURmjiBallJlazaFWoLBnE+Zn9oYSpHiYb eWPQ== 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=tutQCfauTN9/8vwFRsGkgzK0YD4hnge2LTjHjW6uUJmx1wDHk/F4MEn6BHCIvxnS2b PZdl/6hwyVz6f7SjywcJu4PC8y2TyqyxE9Jj3CMRpbx2AcbieXVjt0v6+Fwq7d1zcs/k KXWqzhzL1LXnclskF3RuRqKJVXgo9IZ5zxl8ITV/K+oL2w8jQ3S4ibHmfYpqm5JIHJMa AqG6HZMnPEtQRBu0JhahvqLTb0ezr6epVoHk5m5V7dPhYQPCSf4CPDANQdVq7KkaTfNg iTS+OallA8sjeSK5pxPh0n4xRXYwRWJOBulm1OFqj8sKt6YNhxFZ/hR8FIEe8fHCgK58 RvkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yVrDX4Nq; 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 a42si15466256edf.438.2021.04.19.08.43.54; Mon, 19 Apr 2021 08:44:17 -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=yVrDX4Nq; 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 S241592AbhDSN0Q (ORCPT + 99 others); Mon, 19 Apr 2021 09:26:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:57240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241171AbhDSNUJ (ORCPT ); Mon, 19 Apr 2021 09:20:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 39D6961360; Mon, 19 Apr 2021 13:15:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618838146; bh=ejUAZqMGKPGXwEmklG9FMFdemyZwfc4HRXSxVzTuR08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yVrDX4Nq+imiP7OHkSJvkgNpbi5B6DdUvGybnWfM8lr0K5aitZCcXmo80Sod58UqP SHfTunEkenJTZeE2cm8C4XEySBMhPkFagLCwD+i5Wbraf32Tkxhojq+OAnL5ag0EYD 09d5hJNeTLrChMIniv3CIqJjbHusM7G//1Y/MpLM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pablo Neira Ayuso Subject: [PATCH 5.10 059/103] netfilter: conntrack: do not print icmpv6 as unknown via /proc Date: Mon, 19 Apr 2021 15:06:10 +0200 Message-Id: <20210419130529.835667269@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130527.791982064@linuxfoundation.org> References: <20210419130527.791982064@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";