Re: [PATCH v4] usb: gadget: f_tcm: reject a short write data-out transfer

From: Greg KH

Date: Fri Nov 20 2026 - 06:11:29 EST


On Tue, Oct 13, 2026 at 01:39:51PM +0900, Yehyeong Lee wrote:
> usbg_data_write_cmpl() copies se_cmd->data_length bytes out of the bounce
> buffer into the command's scatter-gather list without checking how much the
> host actually sent. A BOT host can declare a larger OUT transfer than it
> delivers and end the data stage with a short packet: req->actual is then
> shorter than req->length, but the completion handler still commits the full
> declared length. The tail past req->actual is whatever was already in the
> kmalloc'd bounce buffer, which is not zeroed, so uninitialised kernel heap
> is written to the backing store and can be read back by the host.
>
> Fail the command when req->actual does not match req->length instead of
> committing the stale tail. The short packet means the host has already
> ended the OUT stage, so mark the command and report the residue in the CSW
> without re-arming ep_out to drain data that will never arrive, the way
> f_mass_storage treats a short_packet_received.
>
> A short 8192/4096 WRITE then commits nothing to the backing store instead
> of 4096 bytes of stale heap, and the CSW reports a residue of 8192 with no
> OUT drain queued.
>
> Fixes: c52661d60f63 ("usb-gadget: Initial merge of target module for UASP + BOT")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Yehyeong Lee <yhlee@xxxxxxxxxxxxxxxxxx>
> ---
> v4:
> - Keep cmd->data_len so the CSW still reports the untransferred length as
> the residue. v2/v3 cleared it, which reported a residue of 0 and told
> the host the whole transfer had been accepted. Skip the ep_out drain
> with a command flag instead, matching f_mass_storage.
> v3: https://lore.kernel.org/linux-usb/20261013015416.2503787-1-yhlee@xxxxxxxxxxxxxxxxxx/
> v2: https://lore.kernel.org/linux-usb/20261013005854.2470384-1-yhlee@xxxxxxxxxxxxxxxxxx/
> v1: https://lore.kernel.org/linux-usb/20261012154422.2436134-1-yhlee@xxxxxxxxxxxxxxxxxx/
>
> drivers/usb/gadget/function/f_tcm.c | 14 +++++++++++---
> drivers/usb/gadget/function/tcm.h | 1 +
> 2 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
> index 9e6d4f39900a2..d686fbcf36f72 100644
> --- a/drivers/usb/gadget/function/f_tcm.c
> +++ b/drivers/usb/gadget/function/f_tcm.c
> @@ -120,7 +120,8 @@ static void bot_send_bad_status(struct usbg_cmd *cmd)
>
> csw->Residue = cpu_to_le32(cmd->data_len);
>
> - if (cmd->data_len) {
> + /* a short data-out already ended the phase; draining it would hang */
> + if (cmd->data_len && !(cmd->flags & USBG_CMD_OUT_SHORT)) {
> if (cmd->is_read) {
> ep = fu->ep_in;
> req = fu->bot_req_in;
> @@ -1090,8 +1091,15 @@ static void usbg_data_write_cmpl(struct usb_ep *ep, struct usb_request *req)
> return;
> }
>
> - if (req->status) {
> - pr_err("%s() state %d transfer failed\n", __func__, cmd->state);
> + /* a short data-out left the buffer unwritten; don't commit stale data */
> + if (req->status || req->actual != req->length) {
> + struct usb_gadget *gadget = fuas_to_gadget(cmd->fu);
> +
> + if (!req->status)
> + cmd->flags |= USBG_CMD_OUT_SHORT;
> +
> + dev_err_ratelimited(&gadget->dev, "%s() state %d transfer failed\n",
> + __func__, cmd->state);

Why is this needed? And __func__ is never needed for dev_() calls.

thanks,

greg k-h