]> asedeno.scripts.mit.edu Git - linux.git/commit
rds; Reset rs->rs_bound_addr in rds_add_bound() failure path
authorSowmini Varadhan <sowmini.varadhan@oracle.com>
Fri, 22 Dec 2017 17:38:59 +0000 (09:38 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Dec 2017 18:37:27 +0000 (13:37 -0500)
commit7ae0c649c47f1c5d2db8cee6dd75855970af1669
tree1b8c459e88b0a7a45f85551227227e02a0f119e6
parent3c1490913f3bcf750261649e7ffd62390187058c
rds; Reset rs->rs_bound_addr in rds_add_bound() failure path

If the rds_sock is not added to the bind_hash_table, we must
reset rs_bound_addr so that rds_remove_bound will not trip on
this rds_sock.

rds_add_bound() does a rds_sock_put() in this failure path, so
failing to reset rs_bound_addr will result in a socket refcount
bug, and will trigger a WARN_ON with the stack shown below when
the application subsequently tries to close the PF_RDS socket.

     WARNING: CPU: 20 PID: 19499 at net/rds/af_rds.c:496 \
rds_sock_destruct+0x15/0x30 [rds]
       :
     __sk_destruct+0x21/0x190
     rds_remove_bound.part.13+0xb6/0x140 [rds]
     rds_release+0x71/0x120 [rds]
     sock_release+0x1a/0x70
     sock_close+0xe/0x20
     __fput+0xd5/0x210
     task_work_run+0x82/0xa0
     do_exit+0x2ce/0xb30
     ? syscall_trace_enter+0x1cc/0x2b0
     do_group_exit+0x39/0xa0
     SyS_exit_group+0x10/0x10
     do_syscall_64+0x61/0x1a0

Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/rds/bind.c