]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
IB/cm: Bump reference count on cm_id before invoking callback
authorSean Hefty <sean.hefty@intel.com>
Wed, 23 Feb 2011 16:17:40 +0000 (08:17 -0800)
committerWilly Tarreau <w@1wt.eu>
Sat, 30 Apr 2011 14:53:17 +0000 (16:53 +0200)
commit 29963437a48475036353b95ab142bf199adb909e upstream.

When processing a SIDR REQ, the ib_cm allocates a new cm_id.  The
refcount of the cm_id is initialized to 1.  However, cm_process_work
will decrement the refcount after invoking all callbacks.  The result
is that the cm_id will end up with refcount set to 0 by the end of the
sidr req handler.

If a user tries to destroy the cm_id, the destruction will proceed,
under the incorrect assumption that no other threads are referencing
the cm_id.  This can lead to a crash when the cm callback thread tries
to access the cm_id.

This problem was noticed as part of a larger investigation with kernel
crashes in the rdma_cm when running on a real time OS.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Acked-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/infiniband/core/cm.c

index 922d35f4fc08aa07d69355a812577f9534e82567..29deac3abe5c3817e6b8bce73d91a542eeef3419 100644 (file)
@@ -2987,6 +2987,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
                goto out; /* No match. */
        }
        atomic_inc(&cur_cm_id_priv->refcount);
+       atomic_inc(&cm_id_priv->refcount);
        spin_unlock_irq(&cm.lock);
 
        cm_id_priv->id.cm_handler = cur_cm_id_priv->id.cm_handler;