[PATCH] [RXRPC]: do not unlock unheld spinlock in rxrpc_connect_exclusive()

[PATCH] [RXRPC]: do not unlock unheld spinlock in rxrpc_connect_exclusive()

[Alexey Khoroshilov]

If rx->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 <khoroshilov@ispras.ru>
---
 net/rxrpc/ar-connection.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
index 4106ca95ec86..4790140a1722 100644
--- a/net/rxrpc/ar-connection.c
+++ b/net/rxrpc/ar-connection.c
@@ -381,6 +381,11 @@ static int rxrpc_connect_exclusive(struct rxrpc_sock *rx,
 
 		rxrpc_assign_connection_id(conn);
 		rx->conn = conn;
+	} else {
+		spin_lock(&trans->client_lock);
+
+		_net("CONNECT EXCL old %d on TRANS %d",
+		     conn->debug_id, conn->trans->debug_id);
 	}
 
 	/* we've got a connection with a free channel and we can now attach the
-- 
1.8.3.2

Re: [PATCH] [RXRPC]: do not unlock unheld spinlock in rxrpc_connect_exclusive()

[David Miller]

From: Alexey Khoroshilov <khoroshilov@ispras.ru>
Date: Sat, 14 Dec 2013 02:56:09 +0400

> +		_net("CONNECT EXCL old %d on TRANS %d",
> +		     conn->debug_id, conn->trans->debug_id);

Please do not add more of these ad-hoc kernel log tracing entries.

Thanks.

Re: [PATCH] [RXRPC]: do not unlock unheld spinlock in rxrpc_connect_exclusive()

[David Howells]

Alexey Khoroshilov <khoroshilov@ispras.ru> wrote:

> If rx->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 <khoroshilov@ispras.ru>

Looks good, thanks!  I've added it to my AFS branch.

David

Re: [PATCH] [RXRPC]: do not unlock unheld spinlock in rxrpc_connect_exclusive()

[David Howells]

David Miller <davem@davemloft.net> wrote:

> From: Alexey Khoroshilov <khoroshilov@ispras.ru>
> Date: Sat, 14 Dec 2013 02:56:09 +0400
> 
> > +		_net("CONNECT EXCL old %d on TRANS %d",
> > +		     conn->debug_id, conn->trans->debug_id);
> 
> Please do not add more of these ad-hoc kernel log tracing entries.

Why not?  They're useful for debugging and they give me more control than
plain printk().

I presume you want all the debugging statements in net/rxrpc/ changing to
something else - but what?

David