Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2678248pxb; Mon, 19 Apr 2021 11:03:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIMFNA2gVf4qr2RiMDNIIxKaCK9fxMUtLdjg6y95LNwl2HytzVGgkVGTTioCUrQlK5qUEw X-Received: by 2002:aa7:cc98:: with SMTP id p24mr27093102edt.187.1618855405617; Mon, 19 Apr 2021 11:03:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618855405; cv=none; d=google.com; s=arc-20160816; b=V0KlCQgoqPHN5pYD3QwxJ+2HtsYtLJP3uQFCsYhYw8pNM5XihOg/c1hufH5TETzyBc HG+5HZ/ro95LUu468hbCYAE5bo2QM5MfaR8iIrgRTHgZ55VIO/xHtLy8yFrZc3OkhmU3 BX1CvFp6yb1IxoF1jRYxYVDPMCaDoGKIx/TH2juK2K6qHD1ieA+HunDK9WuA2AzlZ6/9 gdbZy2AYCh+6i/moW4bEKnMgSE5rPqqof0n+fWWcN9rPR7dzOSVpJoNT+4E76IYPMWnn b9LQgCNM1icMWFOA5YI/W9eThoW6hqvkbanYUK23WX9BTD72ym4dVxn4AHCWKj9tnR9t e0Tw== 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=MHQ89kgKnfhSRrJ0zhgJo+BG1TxGaYm5V5/zZtVaqea125QdPx6lYxMkiYdaPLfam8 Z8gMaSTUugbxR/gZ7Gs/gFW59sQh8j6qHSTEeKrDC+D3UP2lbg6bT+SLuzxTJ4S5gSo9 R6mnMAYWWHBcnRE8ocvVkeJWzWurU8wPyI2vFoHStA7KLGPq0bUM0zSGoMhG8vI20Fxv e0An49bOAFfjy2uwVFTxn1sd7HJEiM6F5ydcFq+e63qxdqqFZBa4Fr/nRjotpjYs/xlF 9IDV3SInszOE1L3Pz2KXAb9jy5en+n6sRAFhDdTGyaqpT//Zr3W1MdS4Xy3ggsTbUhnB /0rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=imfZojlX; 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 a3si12996403ejj.228.2021.04.19.11.02.49; Mon, 19 Apr 2021 11:03:25 -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=imfZojlX; 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 S241966AbhDSNhd (ORCPT + 99 others); Mon, 19 Apr 2021 09:37:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:34780 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242045AbhDSNZO (ORCPT ); Mon, 19 Apr 2021 09:25:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9A773613AF; Mon, 19 Apr 2021 13:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618838411; bh=ejUAZqMGKPGXwEmklG9FMFdemyZwfc4HRXSxVzTuR08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=imfZojlX+K+582Kh/h1wI/OU22eZHJTByPUBJj96J3izcXBRc6P+FYu2R4atkTxmE iWoY+nkeh3Sm8G4S4blcCpQ+qvJiooiWXW3B3WUFxOD+OtLdTIUMqZHizJnjiKPi8q 3Fk+q/tSPunJ5PP84egTkq++BOEgvIFVzPqjFXzo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pablo Neira Ayuso Subject: [PATCH 5.4 50/73] netfilter: conntrack: do not print icmpv6 as unknown via /proc Date: Mon, 19 Apr 2021 15:06:41 +0200 Message-Id: <20210419130525.446408123@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130523.802169214@linuxfoundation.org> References: <20210419130523.802169214@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";