Skip to contentSkip to conversation

Patch "RDS: fix rds_tcp_init() error path" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Aug 8, 2016

Subsystems (3)
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

RDS: fix rds_tcp_init() error path

to the 4.4-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:
rds-fix-rds_tcp_init-error-path.patch
and it can be found in the queue-4.4 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 3dad5424adfb346c871847d467f97dcdca64ea97 Mon Sep 17 00:00:00 2001

From: Vegard Nossum <[email protected]>
Date: Sun, 3 Jul 2016 10:54:54 +0200
Subject: RDS: fix rds_tcp_init() error path

From: Vegard Nossum <[email protected]>

commit 3dad5424adfb346c871847d467f97dcdca64ea97 upstream.

If register_pernet_subsys() fails, we shouldn't try to call unregister_pernet_subsys().

Fixes 467fa15356 ("RDS-TCP: Support multiple RDS-TCP listen endpoints, one per netns.")
Cc Sowmini Varadhan <[email protected]>
Cc David S. Miller <[email protected]>
---
 net/rds/tcp.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
net/rds/tcp.c +3 -2
@@ -421,7 +421,7 @@ static int rds_tcp_init(void)
 
 	ret = rds_tcp_recv_init();
 	if (ret)
-		goto out_slab;
+		goto out_pernet;
 
 	ret = rds_trans_register(&rds_tcp_transport);
 	if (ret)
@@ -433,8 +433,9 @@ static int rds_tcp_init(void)
 
 out_recv:
 	rds_tcp_recv_exit();
-out_slab:
+out_pernet:
 	unregister_pernet_subsys(&rds_tcp_net_ops);
+out_slab:
 	kmem_cache_destroy(rds_tcp_conn_slab);
 out:
 	return ret;

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/ext4-verify-extent-header-depth.patch
queue-4.4/rds-fix-rds_tcp_init-error-path.patch