From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41086 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754575AbbLaDxa (ORCPT ); Wed, 30 Dec 2015 22:53:30 -0500 Subject: Patch "fou: clean up socket with kfree_rcu" has been added to the 4.1-stable tree To: hannes@stressinduktion.org, davem@davemloft.net, gregkh@linuxfoundation.org, tom@herbertland.com Cc: , From: Date: Wed, 30 Dec 2015 19:53:08 -0800 Message-ID: <145153398819185@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled fou: clean up socket with kfree_rcu to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: fou-clean-up-socket-with-kfree_rcu.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Wed Dec 30 19:52:45 PST 2015 From: Hannes Frederic Sowa Date: Tue, 15 Dec 2015 21:01:53 +0100 Subject: fou: clean up socket with kfree_rcu From: Hannes Frederic Sowa [ Upstream commit 3036facbb7be3a169e35be3b271162b0fa564a2d ] fou->udp_offloads is managed by RCU. As it is actually included inside the fou sockets, we cannot let the memory go out of scope before a grace period. We either can synchronize_rcu or switch over to kfree_rcu to manage the sockets. kfree_rcu seems appropriate as it is used by vxlan and geneve. Fixes: 23461551c00628c ("fou: Support for foo-over-udp RX path") Cc: Tom Herbert Signed-off-by: Hannes Frederic Sowa Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/fou.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/ipv4/fou.c +++ b/net/ipv4/fou.c @@ -24,6 +24,7 @@ struct fou { u16 type; struct udp_offload udp_offloads; struct list_head list; + struct rcu_head rcu; }; #define FOU_F_REMCSUM_NOPARTIAL BIT(0) @@ -421,7 +422,7 @@ static void fou_release(struct fou *fou) list_del(&fou->list); udp_tunnel_sock_release(sock); - kfree(fou); + kfree_rcu(fou, rcu); } static int fou_encap_init(struct sock *sk, struct fou *fou, struct fou_cfg *cfg) Patches currently in stable-queue which might be from hannes@stressinduktion.org are queue-4.1/ipv6-automatically-enable-stable-privacy-mode-if-stable_secret-set.patch queue-4.1/af_unix-revert-lock_interruptible-in-stream-receive-code.patch queue-4.1/fou-clean-up-socket-with-kfree_rcu.patch queue-4.1/ipv6-keep-existing-flags-when-setting-ifa_f_optimistic.patch queue-4.1/net-add-validation-for-the-socket-syscall-protocol-argument.patch