From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [PATCH net] ipv4: fix memory leaks in udp_sendmsg,
 ping_v4_sendmsg
Date: Fri, 11 May 2018 12:01:41 -0400 (EDT)
Message-ID: <20180511.120141.2299551453735751793.davem@davemloft.net>
References: <20180510175934.2259802-1-rdna@fb.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org, ast@kernel.org, eric.dumazet@gmail.com,
        kernel-team@fb.com
To: rdna@fb.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:47340 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751096AbeEKQBn (ORCPT
        <rfc822;netdev@vger.kernel.org>); Fri, 11 May 2018 12:01:43 -0400
In-Reply-To: <20180510175934.2259802-1-rdna@fb.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Andrey Ignatov <rdna@fb.com>
Date: Thu, 10 May 2018 10:59:34 -0700

> Fix more memory leaks in ip_cmsg_send() callers. Part of them were fixed
> earlier in 919483096bfe.
> 
> * udp_sendmsg one was there since the beginning when linux sources were
>   first added to git;
> * ping_v4_sendmsg one was copy/pasted in c319b4d76b9e.
> 
> Whenever return happens in udp_sendmsg() or ping_v4_sendmsg() IP options
> have to be freed if they were allocated previously.
> 
> Add label so that future callers (if any) can use it instead of kfree()
> before return that is easy to forget.
> 
> Fixes: c319b4d76b9e (net: ipv4: add IPPROTO_ICMP socket kind)
> Signed-off-by: Andrey Ignatov <rdna@fb.com>

Applied and queued up for -stable, thank you.