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=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 7F151C33CB1 for ; Tue, 14 Jan 2020 11:31:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B22524673 for ; Tue, 14 Jan 2020 11:31:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728876AbgANLb5 (ORCPT ); Tue, 14 Jan 2020 06:31:57 -0500 Received: from Chamillionaire.breakpoint.cc ([193.142.43.52]:50054 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725956AbgANLb4 (ORCPT ); Tue, 14 Jan 2020 06:31:56 -0500 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1irKQK-00054u-6S; Tue, 14 Jan 2020 12:31:52 +0100 Date: Tue, 14 Jan 2020 12:31:52 +0100 From: Florian Westphal To: Eyal Birger Cc: pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de, davem@davemloft.net, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, Shmulik Ladkani Subject: Re: [net,v2] netfilter: nat: fix ICMP header corruption on ICMP errors Message-ID: <20200114113152.GN795@breakpoint.cc> References: <20200114080350.4693-1-eyal.birger@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200114080350.4693-1-eyal.birger@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Eyal Birger wrote: > Commit 8303b7e8f018 ("netfilter: nat: fix spurious connection timeouts") > made nf_nat_icmp_reply_translation() use icmp_manip_pkt() as the l4 > manipulation function for the outer packet on ICMP errors. > > However, icmp_manip_pkt() assumes the packet has an 'id' field which > is not correct for all types of ICMP messages. > > This is not correct for ICMP error packets, and leads to bogus bytes > being written the ICMP header, which can be wrongfully regarded as > 'length' bytes by RFC 4884 compliant receivers. > > Fix by assigning the 'id' field only for ICMP messages that have this > semantic. Looks good, thanks Eyal. Acked-by: Florian Westphal