Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752689AbdF2MNy (ORCPT <rfc822;w@1wt.eu>);
        Thu, 29 Jun 2017 08:13:54 -0400
Received: from imap0.codethink.co.uk ([185.43.218.159]:37327 "EHLO
        imap0.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752105AbdF2MNs (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 29 Jun 2017 08:13:48 -0400
Message-ID: <1498738415.1935.31.camel@codethink.co.uk>
Subject: Re: [PATCH 4.4 09/46] ipv6: Inhibit IPv4-mapped src address on the
 wire.
From: Ben Hutchings <ben.hutchings@codethink.co.uk>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "David S. Miller" <davem@davemloft.net>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        "Jonathan T. Leighton" <jtleight@udel.edu>,
        Sasha Levin <alexander.levin@verizon.com>
Date: Thu, 29 Jun 2017 13:13:35 +0100
In-Reply-To: <20170615175218.730377582@linuxfoundation.org>
References: <20170615175218.286057711@linuxfoundation.org>
         <20170615175218.730377582@linuxfoundation.org>
Organization: Codethink Ltd.
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.12.9-1+b1 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1497
Lines: 53

On Thu, 2017-06-15 at 19:52 +0200, Greg Kroah-Hartman wrote:
> 4.4-stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: "Jonathan T. Leighton" <jtleight@udel.edu>
> 
> 
> [ Upstream commit ec5e3b0a1d41fbda0cc33a45bc9e54e91d9d12c7 ]
> 
> This patch adds a check for the problematic case of an IPv4-mapped IPv6
> source address and a destination address that is neither an IPv4-mapped
> IPv6 address nor in6addr_any, and returns an appropriate error. The
> check in done before returning from looking up the route.

I think this needs to be followed by:

commit 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869
Author: Willem de Bruijn <willemb@google.com>
Date:   Sat Feb 18 19:00:45 2017 -0500

    ipv6: release dst on error in ip6_dst_lookup_tail

Ben.

> Signed-off-by: Jonathan T. Leighton <jtleight@udel.edu>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  net/ipv6/ip6_output.c |    3 +++
>  1 file changed, 3 insertions(+)
> 
> --- a/net/ipv6/ip6_output.c
> +++ b/net/ipv6/ip6_output.c
> @@ -1004,6 +1004,9 @@ static int ip6_dst_lookup_tail(struct ne
>  		}
>  	}
>  #endif
> +	if (ipv6_addr_v4mapped(&fl6->saddr) &&
> +	    !(ipv6_addr_v4mapped(&fl6->daddr) || ipv6_addr_any(&fl6->daddr)))
> +		return -EAFNOSUPPORT;
>  
>  	return 0;
>  
> 
> 
> 

-- 
Ben Hutchings
Software Developer, Codethink Ltd.