From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755307AbbKCPwy (ORCPT ); Tue, 3 Nov 2015 10:52:54 -0500 Received: from shards.monkeyblade.net ([149.20.54.216]:44811 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755245AbbKCPwv (ORCPT ); Tue, 3 Nov 2015 10:52:51 -0500 Date: Tue, 03 Nov 2015 10:52:47 -0500 (EST) Message-Id: <20151103.105247.855059013530025317.davem@davemloft.net> To: mkubecek@suse.cz Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org, kaber@trash.net, miyazawa@linux-ipv6.org Subject: Re: [PATCH net] ipv6: fix tunnel error handling From: David Miller In-Reply-To: <20151103075107.9B08EA0CD2@unicorn.suse.cz> References: <20151103075107.9B08EA0CD2@unicorn.suse.cz> X-Mailer: Mew version 6.6 on Emacs 24.5 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Tue, 03 Nov 2015 07:52:51 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michal Kubecek Date: Tue, 3 Nov 2015 08:51:07 +0100 (CET) > Both tunnel6_protocol and tunnel46_protocol share the same error > handler, tunnel6_err(), which traverses through tunnel6_handlers list. > For ipip6 tunnels, we need to traverse tunnel46_handlers as we do e.g. > in tunnel46_rcv(). Current code can generate an ICMPv6 error message > with an IPv4 packet embedded in it. > > Fixes: 73d605d1abbd ("[IPSEC]: changing API of xfrm6_tunnel_register") > Signed-off-by: Michal Kubecek Good catch, applied and queued up for -stable.