RxRPC: do not unlock unheld spinlock in rxrpc_connect_exclusive()

khoroshilov · dhowells · commit 8f22ba61b5d7 · 2014-01-26T11:39:51.000Z
If rx-&gt;conn is not NULL, rxrpc_connect_exclusive() does not
acquire the transport's client lock, but it still releases it.

The patch adds locking of the spinlock to this path.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov &lt;khoroshilov@ispras.ru&gt;
Signed-off-by: David Howells &lt;dhowells@redhat.com&gt;
diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
@@ -381,6 +381,8 @@ static int rxrpc_connect_exclusive(struct rxrpc_sock *rx,
 
 		rxrpc_assign_connection_id(conn);
 		rx->conn = conn;
+	} else {
+		spin_lock(&trans->client_lock);
 	}
 
 	/* we've got a connection with a free channel and we can now attach the

Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,8 @@ static int rxrpc_connect_exclusive(struct rxrpc_sock *rx,`
`381`	`381`
`382`	`382`	`rxrpc_assign_connection_id(conn);`
`383`	`383`	`rx->conn = conn;`
	`384`	`+ } else {`
	`385`	`+ spin_lock(&trans->client_lock);`
`384`	`386`	`}`
`385`	`387`
`386`	`388`	`/* we've got a connection with a free channel and we can now attach the`