Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp1216347pxx; Tue, 27 Oct 2020 10:57:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9bx1p6gnC2vl3n1uleWBCj9PIdKWjjrIOshMQIzlmvSE26mSVRbRgoDBBU5ZBd7WaeYdA X-Received: by 2002:a17:907:43c6:: with SMTP id i6mr3499577ejs.207.1603821420211; Tue, 27 Oct 2020 10:57:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603821420; cv=none; d=google.com; s=arc-20160816; b=ruTcRBHuJGxiMONiycyfFxclOGEzDqFEcTUvsZXmybVXZT0Uv0SWoMqS/L/4DMieN+ ckB680Hu65PfQFdpa42g/RN36hx+hMGyetaNxiLM1Mr33uIehlSBwxm3v8oMde9yzkk/ yvXVQjbYudOwmmfblHVTbJgTFu5Yjr3aITRv8YXzxmeLilEIxxRX3xk2XhHsVpWWWdZn IVl/Iv0Wy4tht1FnYC+7MEaqMkq4/OHr9htVP9fytsseVp0Pi78llzf/BQgAEc6wfkvj HyQMbRRwcDXy6PxMjjSaVXMe/Ozfg94dYooF2tLdr+kdqjf332zTGq5LOu15vgisGDuk kW0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MUVV9m0jPGwKzimtFloSyDyKg+cnfGVS4pkyqcljL+c=; b=BLrZLwIERDzNGcrmYKU99SpzHsERGrLYMGKnjd3KUzk1zRm38e0rHXdHxAIcZBKJHN hJeHrrw4CNU7VY37e9bm34mTehTX17xBS2sKxe1DwTMS3ivsZq3BITrDz4NGcnp/nvVf 3Ht+//SrOk4o2YW/+jH+xtq4pKKN7nU9MxJoiQN9du8FvDX2GqjBUBpMIhR6VEuc/YQi wXHFBpTCRN/3OgWS/qapyxFORJuzUBnam7fH/0vTB4qUbRWFUjL22t4ZS6PerpFoJiU6 Zah8NXdCJlBKdwP7Tumz2SaahL2M2QpirYVEPWpAJE8qvbw5MlltmfUOT75looyZ7ikO STew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=X2yE1+qP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i13si1518661ejk.72.2020.10.27.10.56.37; Tue, 27 Oct 2020 10:57:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=X2yE1+qP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1818751AbgJ0RXN (ORCPT + 99 others); Tue, 27 Oct 2020 13:23:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:55324 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1780572AbgJ0Oyp (ORCPT ); Tue, 27 Oct 2020 10:54:45 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BE18F22264; Tue, 27 Oct 2020 14:54:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810485; bh=PLQg+oHseix0XfmVA+PmIxGILzb7/ce+OLA+evlaqgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X2yE1+qPH8xVCjfWjZncnjpUgIHtr3a5/uDXBXReohTJQ3EkpiMMQP+p6DOULcKOS 2uQP+H02D0YoMxvUd3FDiujUFAAqlaS7tJe3PdbeHNNoAqBxgOKMwaKX/jGvSAK6JA dI4mLcloipYxNYCs43LgflwcSSuqZHV25ggeIVj8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Samuel Holland , Marcel Holtmann , Sasha Levin Subject: [PATCH 5.8 156/633] Bluetooth: hci_uart: Cancel init work before unregistering Date: Tue, 27 Oct 2020 14:48:19 +0100 Message-Id: <20201027135530.010044258@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Samuel Holland [ Upstream commit 3b799254cf6f481460719023d7a18f46651e5e7f ] If hci_uart_tty_close() or hci_uart_unregister_device() is called while hu->init_ready is scheduled, hci_register_dev() could be called after the hci_uart is torn down. Avoid this by ensuring the work is complete or canceled before checking the HCI_UART_REGISTERED flag. Fixes: 9f2aee848fe6 ("Bluetooth: Add delayed init sequence support for UART controllers") Signed-off-by: Samuel Holland Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- drivers/bluetooth/hci_ldisc.c | 1 + drivers/bluetooth/hci_serdev.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 85a30fb9177bb..f83d67eafc9f0 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -538,6 +538,7 @@ static void hci_uart_tty_close(struct tty_struct *tty) clear_bit(HCI_UART_PROTO_READY, &hu->flags); percpu_up_write(&hu->proto_lock); + cancel_work_sync(&hu->init_ready); cancel_work_sync(&hu->write_work); if (hdev) { diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c index 7b233312e723f..3977bba485c22 100644 --- a/drivers/bluetooth/hci_serdev.c +++ b/drivers/bluetooth/hci_serdev.c @@ -355,6 +355,8 @@ void hci_uart_unregister_device(struct hci_uart *hu) struct hci_dev *hdev = hu->hdev; clear_bit(HCI_UART_PROTO_READY, &hu->flags); + + cancel_work_sync(&hu->init_ready); if (test_bit(HCI_UART_REGISTERED, &hu->flags)) hci_unregister_dev(hdev); hci_free_dev(hdev); -- 2.25.1