aboutsummaryrefslogtreecommitdiffstats
path: root/net/rds/connection.c
diff options
context:
space:
mode:
authorZach Brown <zach.brown@oracle.com>2010-07-23 13:32:31 -0400
committerAndy Grover <andy.grover@oracle.com>2010-09-08 21:16:47 -0400
commit5adb5bc65f93e52341c3fc9d03d4030dd375e256 (patch)
tree55b19c7757ccd64f58169a05cd63e91bee409bad /net/rds/connection.c
parent77510481c0c3980c8979ed236d63e59221fb8ce5 (diff)
RDS: have sockets get transport module references
Right now there's nothing to stop the various paths that use rs->rs_transport from racing with rmmod and executing freed transport code. The simple fix is to have binding to a transport also hold a reference to the transport's module, removing this class of races. We already had an unused t_owner field which was set for the modular transports and which wasn't set for the built-in loop transport. Signed-off-by: Zach Brown <zach.brown@oracle.com>
Diffstat (limited to 'net/rds/connection.c')
-rw-r--r--net/rds/connection.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/rds/connection.c b/net/rds/connection.c
index 75a1a37d64d..968b7a79839 100644
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -117,6 +117,7 @@ static struct rds_connection *__rds_conn_create(__be32 laddr, __be32 faddr,
117{ 117{
118 struct rds_connection *conn, *parent = NULL; 118 struct rds_connection *conn, *parent = NULL;
119 struct hlist_head *head = rds_conn_bucket(laddr, faddr); 119 struct hlist_head *head = rds_conn_bucket(laddr, faddr);
120 struct rds_transport *loop_trans;
120 unsigned long flags; 121 unsigned long flags;
121 int ret; 122 int ret;
122 123
@@ -163,7 +164,9 @@ static struct rds_connection *__rds_conn_create(__be32 laddr, __be32 faddr,
163 * can bind to the destination address then we'd rather the messages 164 * can bind to the destination address then we'd rather the messages
164 * flow through loopback rather than either transport. 165 * flow through loopback rather than either transport.
165 */ 166 */
166 if (rds_trans_get_preferred(faddr)) { 167 loop_trans = rds_trans_get_preferred(faddr);
168 if (loop_trans) {
169 rds_trans_put(loop_trans);
167 conn->c_loopback = 1; 170 conn->c_loopback = 1;
168 if (is_outgoing && trans->t_prefer_loopback) { 171 if (is_outgoing && trans->t_prefer_loopback) {
169 /* "outgoing" connection - and the transport 172 /* "outgoing" connection - and the transport