PCI/switchtec: Fix init_completion race condition with poll_wait()
authorLogan Gunthorpe <logang@deltatee.com>
Sat, 21 Mar 2020 11:25:45 +0000 (12:25 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Apr 2020 06:00:27 +0000 (08:00 +0200)
[ Upstream commit efbdc769601f4d50018bf7ca50fc9f7c67392ece ]

The call to init_completion() in mrpc_queue_cmd() can theoretically
race with the call to poll_wait() in switchtec_dev_poll().

  poll() write()
    switchtec_dev_poll()      switchtec_dev_write()
      poll_wait(&s->comp.wait);      mrpc_queue_cmd()
               init_completion(&s->comp)
         init_waitqueue_head(&s->comp.wait)

To my knowledge, no one has hit this bug.

Fix this by using reinit_completion() instead of init_completion() in
mrpc_queue_cmd().

Fixes: 080b47def5e5 ("MicroSemi Switchtec management interface driver")

Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lkml.kernel.org/r/20200313183608.2646-1-logang@deltatee.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pci/switch/switchtec.c

index bf229b442e723745d35d355212bca36a4cafdeab..6ef0d4b756f0994d503565f2be38fdd83be7f266 100644 (file)
@@ -412,7 +412,7 @@ static int mrpc_queue_cmd(struct switchtec_user *stuser)
        kref_get(&stuser->kref);
        stuser->read_len = sizeof(stuser->data);
        stuser_set_state(stuser, MRPC_QUEUED);
-       init_completion(&stuser->comp);
+       reinit_completion(&stuser->comp);
        list_add_tail(&stuser->list, &stdev->mrpc_queue);
 
        mrpc_cmd_submit(stdev);