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 E00A32D8364; Mon, 13 Apr 2026 16:41:13 +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=1776098474; cv=none; b=P4lPYUZgjKFl+C9MLZ61LkvvP6ECMl9/lEL/CUegW3WLfZMWizE2riu3xlsvqHFie9R6OD2Mefry7sjQC0fBaugxCARtAEO8RWoMPDm6G/H6J/qjI6uGCzbVWH0ZDvPtk3avqlJ48fIhlNp/OkxqvQSR1kQM64VYe7X320UCF/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776098474; c=relaxed/simple; bh=LSwNGCs83aEOpqVBgCyXkZUmV+Z5jrDpqN+J7mRsJFk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kq4WAsh35iWk8JuNB58RXi7D/gy72cxlcsbd7m6EbuJkiNYVmDNyClnDzrCd66c+lY39iL8270iExusi7ICZLifxnPSnGnFNVjuq3JVC82QLtarVvlVzsq6cwfVg1jWcXsQHEKNiTZpvwMMWhVwtp6XHkulT7N87872WFty+dZQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tmD7IVZv; 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="tmD7IVZv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75277C2BCAF; Mon, 13 Apr 2026 16:41:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776098473; bh=LSwNGCs83aEOpqVBgCyXkZUmV+Z5jrDpqN+J7mRsJFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tmD7IVZvPBynXhlWHKdBp09FaniAFBAtWQIxY5FgZNJrM9Ma5TMcta5SpGnl7pkLK bCxgYxS9EC5iwF28rBAUvxSMBXs6ebsKZXYVzwgLgWGixW+rmSyjxhvsMbFcgbcAcP YhTiP9SNGUh/6wlD3m8V8R5B3gL9ijKBa+ZtBb5A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pengpeng Hou , Stefan Wahren , Simon Horman , Jakub Kicinski Subject: [PATCH 5.15 537/570] net: qualcomm: qca_uart: report the consumed byte on RX skb allocation failure Date: Mon, 13 Apr 2026 18:01:08 +0200 Message-ID: <20260413155850.562604751@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260413155830.386096114@linuxfoundation.org> References: <20260413155830.386096114@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pengpeng Hou commit b76254c55dc8f23edc089027dd3f8792554c69fb upstream. qca_tty_receive() consumes each input byte before checking whether a completed frame needs a fresh receive skb. When the current byte completes a frame, the driver delivers that frame and then allocates a new skb for the next one. If that allocation fails, the current code returns i even though data[i] has already been consumed and may already have completed the delivered frame. Since serdev interprets the return value as the number of accepted bytes, this under-reports progress by one byte and can replay the final byte of the completed frame into a fresh parser state on the next call. Return i + 1 in that failure path so the accepted-byte count matches the actual receive-state progress. Fixes: dfc768fbe618 ("net: qualcomm: add QCA7000 UART driver") Cc: stable@vger.kernel.org Signed-off-by: Pengpeng Hou Reviewed-by: Stefan Wahren Reviewed-by: Simon Horman Link: https://patch.msgid.link/20260402071207.4036-1-pengpeng@iscas.ac.cn Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/qualcomm/qca_uart.c +++ b/drivers/net/ethernet/qualcomm/qca_uart.c @@ -115,7 +115,7 @@ qca_tty_receive(struct serdev_device *se if (!qca->rx_skb) { netdev_dbg(netdev, "recv: out of RX resources\n"); n_stats->rx_errors++; - return i; + return i + 1; } } }