2007-06-15 21:45:18

by Adrian Bunk

Subject: [2.6 patch] net/rxrpc/ar-connection.c: fix NULL dereference

This patch fixes a NULL dereference spotted by the Coverity checker.

Signed-off-by: Adrian Bunk <[email protected]>

---

net/rxrpc/ar-connection.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.22-rc4-mm2/net/rxrpc/ar-connection.c.old 2007-06-15 23:05:26.000000000 +0200
+++ linux-2.6.22-rc4-mm2/net/rxrpc/ar-connection.c 2007-06-15 23:06:42.000000000 +0200
@@ -200,29 +200,29 @@ static struct rxrpc_connection *rxrpc_al
if (conn) {
INIT_WORK(&conn->processor, &rxrpc_process_connection);
INIT_LIST_HEAD(&conn->bundle_link);
conn->calls = RB_ROOT;
skb_queue_head_init(&conn->rx_queue);
rwlock_init(&conn->lock);
spin_lock_init(&conn->state_lock);
atomic_set(&conn->usage, 1);
conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
conn->avail_calls = RXRPC_MAXCALLS;
conn->size_align = 4;
conn->header_size = sizeof(struct rxrpc_header);
}

- _leave(" = %p{%d}", conn, conn->debug_id);
+ _leave(" = %p{%d}", conn, conn ? conn->debug_id : 0);
return conn;
}

/*
* assign a connection ID to a connection and add it to the transport's
* connection lookup tree
* - called with transport client lock held
*/
static void rxrpc_assign_connection_id(struct rxrpc_connection *conn)
{
struct rxrpc_connection *xconn;
struct rb_node *parent, **p;
__be32 epoch;
u32 real_conn_id;

2007-06-15 22:16:17

by David Miller

Subject: Re: [2.6 patch] net/rxrpc/ar-connection.c: fix NULL dereference

From: Adrian Bunk <[email protected]>
Date: Fri, 15 Jun 2007 23:45:13 +0200

> This patch fixes a NULL dereference spotted by the Coverity checker.
>
> Signed-off-by: Adrian Bunk <[email protected]>

Looks good to me, patch applied, thanks Adrian.

2007-06-18 11:39:53

by David Howells

Subject: Re: [2.6 patch] net/rxrpc/ar-connection.c: fix NULL dereference

Adrian Bunk <[email protected]> wrote:

> This patch fixes a NULL dereference spotted by the Coverity checker.
>
> Signed-off-by: Adrian Bunk <[email protected]>

Acked-by: David Howells <[email protected]>