From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83249634FB; Tue, 23 Jan 2024 01:57:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705975037; cv=none; b=QQxffjb6gmDQYfK1mkL/vb5o1OFnidAAvSArp8W+tlqPyx+OJqoDmdIydhGz3GG3xPKlrWUaaS0ma7gntcjWS6tW7+SfnsoDR8Iy45j+I9jTYtLe01ZVfJW1PH7mb9RUQH3KLdXg2LtZwtgMKYNK8cEYg6kI9srvYbMmA2uwu9Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705975037; c=relaxed/simple; bh=uJrutbwbRtQyWLKo0BU3sjQjySjcPtno2bqT+ihRECQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tlc8BTleu5KazQpxO4eIJxyL8r7WEZqkdwQo8aAyIn2Mpfx5mna8LN25STn0K/lnWgtG1nCDPi0AkDQ3DTugiXkSpPY9+vDJYEtsmZEbtiqS7UxDlxMXyA6ep8lMo6CAQoijSj/aovwwlB9YXmC+X7WhpgFSNkO9OwtrOmh1jyk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cd4H/ZeD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cd4H/ZeD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4552DC433C7; Tue, 23 Jan 2024 01:57:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705975037; bh=uJrutbwbRtQyWLKo0BU3sjQjySjcPtno2bqT+ihRECQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cd4H/ZeDvtkv8aks+6RWZAnDoGEZ5KknvOmZ5LHXjhKGUrwjk3YjxMAPnDzjNmDS0 jToY0tnjQFiJuKdU4fcbmSuomqeSs1LAumVClb54JDNmCj724PoudEZOMH25qqLKsb krdwACl+v0M3++VwtUBTF9EMttt510duU72LlzzA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Francesco Dolcini , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.6 207/583] Bluetooth: btmtkuart: fix recv_buf() return value Date: Mon, 22 Jan 2024 15:54:18 -0800 Message-ID: <20240122235818.332740027@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235812.238724226@linuxfoundation.org> References: <20240122235812.238724226@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Francesco Dolcini [ Upstream commit 64057f051f20c2a2184b9db7f8037d928d68a4f4 ] Serdev recv_buf() callback is supposed to return the amount of bytes consumed, therefore an int in between 0 and count. Do not return negative number in case of issue, just print an error and return count. This fixes a WARN in ttyport_receive_buf(). Link: https://lore.kernel.org/all/087be419-ec6b-47ad-851a-5e1e3ea5cfcc@kernel.org/ Fixes: 7237c4c9ec92 ("Bluetooth: mediatek: Add protocol support for MediaTek serial devices") Signed-off-by: Francesco Dolcini Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- drivers/bluetooth/btmtkuart.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/bluetooth/btmtkuart.c b/drivers/bluetooth/btmtkuart.c index 935feab815d9..203a000a84e3 100644 --- a/drivers/bluetooth/btmtkuart.c +++ b/drivers/bluetooth/btmtkuart.c @@ -336,7 +336,7 @@ mtk_stp_split(struct btmtkuart_dev *bdev, const unsigned char *data, int count, return data; } -static int btmtkuart_recv(struct hci_dev *hdev, const u8 *data, size_t count) +static void btmtkuart_recv(struct hci_dev *hdev, const u8 *data, size_t count) { struct btmtkuart_dev *bdev = hci_get_drvdata(hdev); const unsigned char *p_left = data, *p_h4; @@ -375,25 +375,20 @@ static int btmtkuart_recv(struct hci_dev *hdev, const u8 *data, size_t count) bt_dev_err(bdev->hdev, "Frame reassembly failed (%d)", err); bdev->rx_skb = NULL; - return err; + return; } sz_left -= sz_h4; p_left += sz_h4; } - - return 0; } static int btmtkuart_receive_buf(struct serdev_device *serdev, const u8 *data, size_t count) { struct btmtkuart_dev *bdev = serdev_device_get_drvdata(serdev); - int err; - err = btmtkuart_recv(bdev->hdev, data, count); - if (err < 0) - return err; + btmtkuart_recv(bdev->hdev, data, count); bdev->hdev->stat.byte_rx += count; -- 2.43.0