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;
Subject: Re: [PATCH v3 net] ipv4: fix error path in fou_create()
To:     Kangmin Park <l4stpr0gr4m@gmail.com>,
        "David S. Miller" <davem@davemloft.net>
Cc:     Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
        David Ahern <dsahern@kernel.org>,
        Jakub Kicinski <kuba@kernel.org>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20210808070557.17858-1-l4stpr0gr4m@gmail.com>
From:   David Ahern <dsahern@gmail.com>
Message-ID: <751fe234-21cd-3a56-dff7-6768bbbfaaad@gmail.com>
Date:   Sun, 8 Aug 2021 14:05:31 -0600
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0)
 Gecko/20100101 Thunderbird/78.12.0
MIME-Version: 1.0
In-Reply-To: <20210808070557.17858-1-l4stpr0gr4m@gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 8/8/21 1:05 AM, Kangmin Park wrote:
> sock is always NULL when udp_sock_create() is failed and fou is
> always NULL when kzalloc() is failed in error label.
> 
> So, add error_sock and error_alloc label and fix the error path
> in those cases.
> 
> Signed-off-by: Kangmin Park <l4stpr0gr4m@gmail.com>
> ---
> v3:
>  - change commit message
>  - fix error path
> ---
>  net/ipv4/fou.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
> index e5f69b0bf3df..f1d99e776bb8 100644
> --- a/net/ipv4/fou.c
> +++ b/net/ipv4/fou.c
> @@ -572,13 +572,13 @@ static int fou_create(struct net *net, struct fou_cfg *cfg,
>  	/* Open UDP socket */
>  	err = udp_sock_create(net, &cfg->udp_config, &sock);
>  	if (err < 0)
> -		goto error;
> +		goto error_sock;
>  
>  	/* Allocate FOU port structure */
>  	fou = kzalloc(sizeof(*fou), GFP_KERNEL);
>  	if (!fou) {
>  		err = -ENOMEM;
> -		goto error;
> +		goto error_alloc;
>  	}
>  
>  	sk = sock->sk;
> @@ -627,9 +627,10 @@ static int fou_create(struct net *net, struct fou_cfg *cfg,
>  
>  error:
>  	kfree(fou);
> +error_alloc:
>  	if (sock)
>  		udp_tunnel_sock_release(sock);
> -
> +error_sock:
>  	return err;
>  }
>  
> 

since sock and fou are initialized to NULL, kfree(NULL) is allowed and
there is an 'if (sock)' check before the release, no fix is really needed.