From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 78AD925B0AA; Thu, 20 Aug 2026 15:23:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787239429; cv=none; b=qj9mSkmIZpvRwuqu8549Vcxm8FMdrfTrPHzZCNEFkKmuCMMm/DGrsUczzvn0sw4mJQWRh7fxVK+OpECh7mqrB9tW31LNdipxc3wAVR6MgwJV5UaEGf7CT2FLPhrAmYACzh4BnyBH6e8ENPAR3K00LOHlE7CeGXOIEdevkm9E5Y4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787239429; c=relaxed/simple; bh=3qiomO//92PmMlg/HJKeLBAHMmqRCZmSRURxW7nAIQA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SKifCJhDd480++9JIss/ww4zdcRk8gf4TruBbZ/zEiJ8C576jM69Olt/eYqlGOt79X9oTo3cPWyMNM7D1id3vfod8Ebl2s5xRPJbD0ASQcFlR+TFiB3MCDxgtn0TQR/mzFLOQgwQVjY7Po6UeVSEOMTxZJ2mKvqS9nIokqPPaWU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eaSVoUjR; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="eaSVoUjR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D34B81F000E9; Thu, 20 Aug 2026 15:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787239428; bh=GgG4geCfbDYXeFNW5J4eQvg9CG0Cxo8iyaODVhv0GHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eaSVoUjRJgBjaUGeW9EoM8S7Z0cEFbwEprda2isSlWl2pu90CEoHKCVD6yz1HrGVG EjE9xPtUZzktSK3cXWEWsb2Uq16noKu02fLsGjJCivYUzmSNP+ohg5aPKtbqkqEWRy ezbtQuadd3eg06bm46ELAzup/rcdIh/5tiXNHtSA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot@kernel.org, Dmitry Torokhov Subject: [PATCH 6.12 045/220] Input: synaptics-rmi4 - zero report size on F54 work error Date: Thu, 20 Aug 2026 16:53:55 +0200 Message-ID: <20260820145224.845996215@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145223.480031205@linuxfoundation.org> References: <20260820145223.480031205@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 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Torokhov commit dc76c3c8e8ad09362b8c1561f3928288c15cba2e upstream. In rmi_f54_work(), if an error occurs during report request or command verification, the code jumped directly to the 'error' label, bypassing the 'abort' label where f54->report_size was normally zeroed out. This left f54->report_size containing its previous successful payload size. If a user then altered the V4L2 format to a smaller size, and a subsequent run failed, rmi_f54_buffer_queue() would copy the stale, larger payload size into the shrunken V4L2 buffer, causing a heap buffer overflow. Fix this by merging the 'abort' and 'error' labels into a single 'out' exit path, and ensuring that f54->report_size is always set to 0 on failure by checking for error and zeroing the local report_size first. Fixes: 3a762dbd5347 ("[media] Input: synaptics-rmi4 - add support for F54 diagnostics") Cc: stable@vger.kernel.org Reported-by: sashiko-bot@kernel.org Assisted-by: Antigravity:gemini-3.5-flash Link: https://patch.msgid.link/20260626051802.4033172-2-dmitry.torokhov@gmail.com Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/rmi4/rmi_f54.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- a/drivers/input/rmi4/rmi_f54.c +++ b/drivers/input/rmi4/rmi_f54.c @@ -547,7 +547,7 @@ static void rmi_f54_work(struct work_str dev_err(&fn->dev, "Bad report size, report type=%d\n", f54->report_type); error = -EINVAL; - goto error; /* retry won't help */ + goto out; /* retry won't help */ } /* @@ -558,7 +558,7 @@ static void rmi_f54_work(struct work_str &command); if (error) { dev_err(&fn->dev, "Failed to read back command\n"); - goto error; + goto out; } if (command & F54_GET_REPORT) { if (time_after(jiffies, f54->timeout)) { @@ -566,7 +566,7 @@ static void rmi_f54_work(struct work_str error = -ETIMEDOUT; } report_size = 0; - goto error; + goto out; } rmi_dbg(RMI_DEBUG_FN, &fn->dev, "Get report command completed, reading data\n"); @@ -581,7 +581,7 @@ static void rmi_f54_work(struct work_str fifo, sizeof(fifo)); if (error) { dev_err(&fn->dev, "Failed to set fifo start offset\n"); - goto abort; + goto out; } error = rmi_read_block(fn->rmi_dev, fn->fd.data_base_addr + @@ -590,16 +590,16 @@ static void rmi_f54_work(struct work_str if (error) { dev_err(&fn->dev, "%s: read [%d bytes] returned %d\n", __func__, size, error); - goto abort; + goto out; } } -abort: - f54->report_size = error ? 0 : report_size; -error: +out: if (error) report_size = 0; + f54->report_size = report_size; + if (report_size == 0 && !error) { queue_delayed_work(f54->workqueue, &f54->work, msecs_to_jiffies(1));