Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12ce9fd7 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Greg Kroah-Hartman
Browse files

PCI/switchtec: Fix init_completion race condition with poll_wait() 



[ 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: 080b47de ("MicroSemi Switchtec management interface driver")

Reported-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lkml.kernel.org/r/20200313183608.2646-1-logang@deltatee.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5004f40b

drivers/pci/switch/switchtec.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,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);