1 files changed, 4 insertions, 1 deletions

diff --git a/net/rds/bind.c b/net/rds/bind.c
index 20c156a73e73..5b5fb4ca8d3e 100644
--- a/net/rds/bind.c
+++ b/net/rds/bind.c
@@ -244,7 +244,8 @@ int rds_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
          */
         if (rs->rs_transport) {
                 trans = rs->rs_transport;
-                if (trans->laddr_check(sock_net(sock->sk),
+                if (!trans->laddr_check ||
+                    trans->laddr_check(sock_net(sock->sk),
                                        binding_addr, scope_id) != 0) {
                         ret = -ENOPROTOOPT;
                         goto out;
@@ -263,6 +264,8 @@ int rds_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 
         sock_set_flag(sk, SOCK_RCU_FREE);
         ret = rds_add_bound(rs, binding_addr, &port, scope_id);
+        if (ret)
+                rs->rs_transport = NULL;
 
 out:
         release_sock(sk);