Merge tag 'v3.10.94' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / rds / connection.c

diff --git a/net/rds/connection.c b/net/rds/connection.c
index 642ad42c416ba915680645d8bc3539e5bdee4bf5..e88bf3976e5412a3270c6d39298225dd306c30c9 100644 (file)
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -177,6 +177,12 @@ static struct rds_connection *__rds_conn_create(__be32 laddr, __be32 faddr,
                }
        }
 
+       if (trans == NULL) {
+               kmem_cache_free(rds_conn_slab, conn);
+               conn = ERR_PTR(-ENODEV);
+               goto out;
+       }
+
        conn->c_trans = trans;
 
        ret = trans->conn_alloc(conn, gfp);