From patchwork Thu Jan 26 13:38:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fedor Pchelkin X-Patchwork-Id: 48658 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp276878wrn; Thu, 26 Jan 2023 05:46:13 -0800 (PST) X-Google-Smtp-Source: AK7set+PriUFP2ef3Q40wxl1Ua04su20J9eOzZ6C7OcIJ1jXCFzJxgOOaXKIV0XY8365fOAmg0md X-Received: by 2002:a05:6a21:e38b:b0:b6:55e:caa0 with SMTP id cc11-20020a056a21e38b00b000b6055ecaa0mr2155243pzc.17.1674740773085; Thu, 26 Jan 2023 05:46:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674740773; cv=none; d=google.com; s=arc-20160816; b=aBfD/5fVoC12iufZuA3H5FQ697XbFQ7ooRI9YIfgmffc7cm2wSKByVE5mMbw7xeV4I z2d4EC4s3G+uuLRCau08lHHywg/JQRbbOG8HMut28GNF53Y4T/HwiDuD/ml/OH2b8wZq bWNJwfzjDoODID1Mpt261n5DW7WM7cpqlyBcpPc6RSk1fmzGIpP8BqDL4os6jL7hcHvY 65LdqNqFSt49Ffv05IZR5K5ZC4q8CSYnpxd4G4Init9TfpQklxE2Y/ZiBrc82Y9Qvi6g UWhdwR2QT4rObx8y7RxtfRNEQfNOQnBrAdLjWT9Twp2gsUAJtAlh2BDKK03JfdlAcJbE DkUA== 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 :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=QkDEpXH1Gip6cB8Z5DI/PU+3Jf6pqpNZOdCpsXvaOQk=; b=Jnbfj638RNyWZfVhXY/ZzwCho1y9YoPTss3lMiWKvd9SSJGCLWlIip6BGe6ONYDl0S SsH4lb+3adOzEcXn4ZqeLK6xcLnryKcxf2blfPnEDlsz2YHRqGlG0x4Px5Jrp6I3Olkq nSZ3qXDCAfCKJJu6XH0rD3bdT9nBj2fmYhBP7mepLEg2cnI03KBke4wCBSARtrl3VDh5 MRbNQKJjuNkw0m3SFfA1v8XkLngLHKjTTQzBY2ZucY141t/IeVmLvV/cURl1jKyEO38h 9LnAWtQfXHKvmZ8B/0fgKsVjWczKzqHy/S73z4a4B+65qXJeezBSXujCcXqLJsLzZgnf OIgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=jPwPhgaK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z1-20020a63ac41000000b004788c847617si1172695pgn.292.2023.01.26.05.45.59; Thu, 26 Jan 2023 05:46:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=jPwPhgaK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236486AbjAZNif (ORCPT + 99 others); Thu, 26 Jan 2023 08:38:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229729AbjAZNie (ORCPT ); Thu, 26 Jan 2023 08:38:34 -0500 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 069E83EFE9; Thu, 26 Jan 2023 05:38:34 -0800 (PST) Received: from fedcomp.intra.ispras.ru (unknown [46.242.14.200]) by mail.ispras.ru (Postfix) with ESMTPSA id 168DF40D403D; Thu, 26 Jan 2023 13:38:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 168DF40D403D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1674740312; bh=QkDEpXH1Gip6cB8Z5DI/PU+3Jf6pqpNZOdCpsXvaOQk=; h=From:To:Cc:Subject:Date:From; b=jPwPhgaK9hbw2qhoci3+jAswqFODFk4bJLcZDSq7CHjM/4wkDP/URh8cHoFN5hYYp BHgB914VZRTVajsL3nyu2nWNAvsYjv6yW18W7ytB3QrZ4iKJqDn4+UKsjwINU/MmGu vx8bAH3BE6ZeXsuCT9US8r2M1kWX2ahok90vefig= From: Fedor Pchelkin To: stable@vger.kernel.org, Greg Kroah-Hartman Cc: Fedor Pchelkin , Archie Pusaka , Abhishek Pandit-Subedi , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , "David S. Miller" , Jakub Kicinski , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Khoroshilov , lvc-project@linuxtesting.org, Luiz Augusto von Dentz Subject: [PATCH 4.14/4.19/5.4/5.10/5.15] Bluetooth: hci_sync: cancel cmd_timer if hci_open failed Date: Thu, 26 Jan 2023 16:38:17 +0300 Message-Id: <20230126133817.819879-1-pchelkin@ispras.ru> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756092944850223913?= X-GMAIL-MSGID: =?utf-8?q?1756092980972022091?= From: Archie Pusaka commit 97dfaf073f5881c624856ef293be307b6166115c upstream. If a command is already sent, we take care of freeing it, but we also need to cancel the timeout as well. Signed-off-by: Archie Pusaka Reviewed-by: Abhishek Pandit-Subedi Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Fedor Pchelkin --- net/bluetooth/hci_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index a41b4dcf1a7a..cabe8eb4c14f 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1632,6 +1632,7 @@ static int hci_dev_do_open(struct hci_dev *hdev) hdev->flush(hdev); if (hdev->sent_cmd) { + cancel_delayed_work_sync(&hdev->cmd_timer); kfree_skb(hdev->sent_cmd); hdev->sent_cmd = NULL; }