OSDN Git Service

rxrpc: Fix conn bundle leak in net-namespace exit
authorDavid Howells <dhowells@redhat.com>
Mon, 14 Sep 2020 12:26:47 +0000 (13:26 +0100)
committerDavid Howells <dhowells@redhat.com>
Mon, 14 Sep 2020 15:18:59 +0000 (16:18 +0100)
When the network namespace exits, rxrpc_clean_up_local_conns() needs to
unbundle each client connection it evicts.  Fix it to do this.

kernel BUG at net/rxrpc/conn_object.c:481!
RIP: 0010:rxrpc_destroy_all_connections.cold+0x11/0x13 net/rxrpc/conn_object.c:481
Call Trace:
 rxrpc_exit_net+0x1a4/0x2e0 net/rxrpc/net_ns.c:119
 ops_exit_list+0xb0/0x160 net/core/net_namespace.c:186
 cleanup_net+0x4ea/0xa00 net/core/net_namespace.c:603
 process_one_work+0x94c/0x1670 kernel/workqueue.c:2269
 worker_thread+0x64c/0x1120 kernel/workqueue.c:2415
 kthread+0x3b5/0x4a0 kernel/kthread.c:292
 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:294

Fixes: 245500d853e9 ("rxrpc: Rewrite the client connection manager")
Reported-by: syzbot+52071f826a617b9c76ed@syzkaller.appspotmail.com
Signed-off-by: David Howells <dhowells@redhat.com>
net/rxrpc/conn_client.c

index 180be4d..0eb36ba 100644 (file)
@@ -1112,6 +1112,7 @@ void rxrpc_clean_up_local_conns(struct rxrpc_local *local)
                conn = list_entry(graveyard.next,
                                  struct rxrpc_connection, cache_link);
                list_del_init(&conn->cache_link);
+               rxrpc_unbundle_conn(conn);
                rxrpc_put_connection(conn);
        }