Skip to contentSkip to conversation

Patch "fou: clean up socket with kfree_rcu" has been added to the 4.3-stable tree

PATCH [email protected] 1 participant 1 message Dec 31, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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.3-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.3 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Wed Dec 30 19:48:47 PST 2015

From: Hannes Frederic Sowa <[email protected]>
Date: Tue, 15 Dec 2015 21:01:53 +0100
Subject: fou: clean up socket with kfree_rcu

From: Hannes Frederic Sowa <[email protected]>

[ 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 <[email protected]>
---
 net/ipv4/fou.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/fou.c +2 -1
@@ -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)
@@ -417,7 +418,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 [email protected] are

queue-4.3/ipv6-automatically-enable-stable-privacy-mode-if-stable_secret-set.patch queue-4.3/af_unix-revert-lock_interruptible-in-stream-receive-code.patch queue-4.3/fou-clean-up-socket-with-kfree_rcu.patch queue-4.3/ipv6-keep-existing-flags-when-setting-ifa_f_optimistic.patch queue-4.3/net-add-validation-for-the-socket-syscall-protocol-argument.patch