diff options
author | Sowmini Varadhan <sowmini.varadhan@oracle.com> | 2017-03-04 08:57:33 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-03-07 14:09:59 -0800 |
commit | 8edc3affc0770886c7bfb3436b0fdd09bce13167 (patch) | |
tree | cfe3a2ae7348961f4c8872ffd5158d2ba4e35235 /net/rds/rds.h | |
parent | fa4c7fb2ad2ea5dae57eb875915d0efb1e068543 (diff) | |
download | linux-stable-8edc3affc0770886c7bfb3436b0fdd09bce13167.tar.gz linux-stable-8edc3affc0770886c7bfb3436b0fdd09bce13167.tar.bz2 linux-stable-8edc3affc0770886c7bfb3436b0fdd09bce13167.zip |
rds: tcp: Take explicit refcounts on struct net
It is incorrect for the rds_connection to piggyback on the
sock_net() refcount for the netns because this gives rise to
a chicken-and-egg problem during rds_conn_destroy. Instead explicitly
take a ref on the net, and hold the netns down till the connection
tear-down is complete.
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/rds.h')
-rw-r--r-- | net/rds/rds.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rds/rds.h b/net/rds/rds.h index 39518ef7af4d..82d38ccf5e8b 100644 --- a/net/rds/rds.h +++ b/net/rds/rds.h @@ -147,7 +147,7 @@ struct rds_connection { /* Protocol version */ unsigned int c_version; - possible_net_t c_net; + struct net *c_net; struct list_head c_map_item; unsigned long c_map_queued; @@ -162,13 +162,13 @@ struct rds_connection { static inline struct net *rds_conn_net(struct rds_connection *conn) { - return read_pnet(&conn->c_net); + return conn->c_net; } static inline void rds_conn_net_set(struct rds_connection *conn, struct net *net) { - write_pnet(&conn->c_net, net); + conn->c_net = get_net(net); } #define RDS_FLAG_CONG_BITMAP 0x01 |