Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7504CC433F5 for ; Wed, 23 Mar 2022 22:24:57 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E20A582DD7; Wed, 23 Mar 2022 23:24:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="R1QcC2ug"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C8B4F8141D; Wed, 23 Mar 2022 23:24:53 +0100 (CET) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8A01383FC5 for ; Wed, 23 Mar 2022 23:24:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qk1-x731.google.com with SMTP id h196so2249490qke.12 for ; Wed, 23 Mar 2022 15:24:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QSqusC5ySMzZLlvg3ONKXrnSZJH+VDwRvalAHLCxfXM=; b=R1QcC2ugTmKwPyLkKya6OrZAzEeQuNSb2hbEC3k4PocRFLWp3zDOTY9jtDujgKIVrt nrkqei68C/G+CvmwJjKdkZI8C5IA7OJZKjeHpQT7Ssh36/3DZJ+0PKr7YiBwE+T2ycY3 BQX5SgmTtZMtOWElEA3m85/YTTbrTIP/naZz+i2fTA3f7Ba66TCoZAzmzAAKTb0iiMgD bnSGW6l7syKkV1rfrF/H8b3UpAX/k2GIGUHEHiY2RtVzieK3LhduVuF8EHeCYqWMMnl+ DYqDwQtrPKz/u5XVjzX+Ip9dMV3B+CF3AMSqW1SvnFpjBU4ZldEx1g8sFAzmtD6n769h MDmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QSqusC5ySMzZLlvg3ONKXrnSZJH+VDwRvalAHLCxfXM=; b=HtiEM6A7G1dU8gW9GFxEM2JtzjQRRHj/va4dKXAGMX9/JP7tZWU7ZOu0fYVS+5VFa8 hJFQDl0dhzBHTtFykOGCeWs/zUfi2U9jZvDERQYgJaT3GANIotvRCrlLmJL3iXk6Wo6k Ow2XHKt5bzg5LGmmSKtDJNp//iKdyqK6Z6fbemUJOlPYMY4XLUwROLtLzXKg6/ZrjUBJ ZI8jEOUOZvEjw2T1w1Kqfe1Lu9esj3U36mbC0A4uwKukotvZ8rB5seTd1vzOFwRrhzjR ZLUbP8AtGn1PWvu6dYwT12LbSfGwdJiasFgYYToU1apBqGx5+lusOvd0UYhh7GZwp4HW cL3A== X-Gm-Message-State: AOAM533D8uq7coJIrgWWvEoDEKpkXIIhr4QTRYiUKSysrI02m7duQvq5 bIX5Ix4ck/Klz9hZUjlmQjg= X-Google-Smtp-Source: ABdhPJxpc7GlCVuCAJzPS62Yiv0Zy8CFg+1XB/bM6tmRNoFAwZ+TobFRjgrxGSh44ynmfiKC/sISZw== X-Received: by 2002:a37:6407:0:b0:67e:4423:7127 with SMTP id y7-20020a376407000000b0067e44237127mr1489419qkb.526.1648074289286; Wed, 23 Mar 2022 15:24:49 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-18-137-133.washdc.fios.verizon.net. [108.18.137.133]) by smtp.gmail.com with ESMTPSA id a16-20020a05622a02d000b002e20e4bf4aesm1067518qtx.23.2022.03.23.15.24.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 15:24:48 -0700 (PDT) From: Sean Anderson To: Marek Vasut , u-boot@lists.denx.de Cc: Simon Glass , Sean Anderson Subject: [PATCH] sandbox: usb: Fix out-of-bounds read when fd=-1 Date: Wed, 23 Mar 2022 18:24:38 -0400 Message-Id: <20220323222438.129310-1-seanga2@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean sandbox_flash_bulk uses priv->read_len to determine if priv->buff contains the response data (such as from SCSI_INQUIRY). However, if priv->fd=-1 in handle_read, then priv->read_len is not set even though we are going to PHASE_DATA. This causes sandbox_flash_bulk to try and read len bytes from priv->buff, which likely goes past the end of the buffer. Fix this by always setting priv->read_len even if we aren't going to read anything. Fixes: f4f715360c ("dm: usb: sandbox: Add an emulator for USB flash devices") Signed-off-by: Sean Anderson --- Is returning -EIO correct here? Should we return 0 (nothing read)? Or pretend to read the whole thing and then let the caller figure it out based on the status? drivers/usb/emul/sandbox_flash.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c index edabc1b3a7..f20c6ad754 100644 --- a/drivers/usb/emul/sandbox_flash.c +++ b/drivers/usb/emul/sandbox_flash.c @@ -228,9 +228,9 @@ static void handle_read(struct sandbox_flash_priv *priv, ulong lba, ulong transfer_len) { debug("%s: lba=%lx, transfer_len=%lx\n", __func__, lba, transfer_len); + priv->read_len = transfer_len; if (priv->fd != -1) { os_lseek(priv->fd, lba * SANDBOX_FLASH_BLOCK_LEN, OS_SEEK_SET); - priv->read_len = transfer_len; setup_response(priv, priv->buff, transfer_len * SANDBOX_FLASH_BLOCK_LEN); } else { @@ -336,6 +336,9 @@ static int sandbox_flash_bulk(struct udevice *dev, struct usb_device *udev, if (priv->read_len) { ulong bytes_read; + if (priv->fd == -1) + return -EIO; + bytes_read = os_read(priv->fd, buff, len); if (bytes_read != len) return -EIO; -- 2.35.1