From patchwork Tue Nov 8 21:58:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sultan Khan X-Patchwork-Id: 1701540 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=MxgBdVcL; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N6QfK3zfpz23ll for ; Wed, 9 Nov 2022 11:22:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1A76683F5B; Wed, 9 Nov 2022 01:22:37 +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="MxgBdVcL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 26074806D6; Tue, 8 Nov 2022 23:01:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) (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 DA78784ED3 for ; Tue, 8 Nov 2022 23:01:03 +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=sultanqasim@gmail.com Received: by mail-qk1-x729.google.com with SMTP id z1so9953480qkl.9 for ; Tue, 08 Nov 2022 14:01:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LQ+lXNDXo4zA7JKs81g28kq9rTeE9amyFwxW/dlUNBY=; b=MxgBdVcLX7BQggp5+V+xsDmnJr/I6FbQQNToal0F6yFxvreHvJplWw/kwcrnXIGF5U 9/gFV9g4MPry47GjuDJZSu05C8zG9Lcvz+W8q3w+8v9w0BQNEGj2puk6IUynREv7s9Zf 2NC6UcDDQg1QSar6NEbgsULwHB+5YkFNDi4Qm0vUnwiZbnKXLJwgfCpFRQOf9ZfA2SMo V1GP/WpIdnH9+ZSOV/3DRDwN8tIh68QA3j7+eV/NVfb3DEqFjN78FbF95IWJPNVmuLG1 4yWVkQPUsDRrWIQ3XDKQ9MUMi0aZ+YCcCe/knuQihsFPi0lDpHKTkfoBRJkxGDtpRGIp 5pXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LQ+lXNDXo4zA7JKs81g28kq9rTeE9amyFwxW/dlUNBY=; b=VpJhlaGatG4vLTFewzBM8k+7IJqL9dd+unIIEoXdl8fwv5zYv/MhR3o9MvaOjDmP9B yZn6GEU53W8KakqfCgFiFefcHZNaHgRmkboOgB0DiKmAbbIEjPTo8WyLMb87T32p3L2w MKJzSDtNAwazK953Q1CzC+rW5ZewZlufLcWVIy/QbrmA4m+u5yzBRClC1z0U4FMkswX0 L767C8L4335Yt125fNF2vZWj0jOOTiHauEzGyUkimvjros+sU6jsQOcRccln18iVG7mX zjpv9Y+0I+rWwVwLxc6fL14Pe/WtFcjYK5Ip6q2WDyXd3n/U+OqukxICkhbG/5BRFHOz mBgA== X-Gm-Message-State: ACrzQf1f+vqr1lfw6Piya8/RciotLdhMkIDJRQmH6ArIhmLh02FWg5+y v9o5ZEv/IVH65d5OJnMrC2mdvd/Vyx4= X-Google-Smtp-Source: AMsMyM5jPWOHGf7bhnyPy4FYXmISct0FdmOLrAMxsb1qifC6F8UAtZRwnqDfJAcrQFXr0Ry6Ofetdg== X-Received: by 2002:a05:620a:318d:b0:6ce:d8de:bab2 with SMTP id bi13-20020a05620a318d00b006ced8debab2mr40718020qkb.456.1667944862202; Tue, 08 Nov 2022 14:01:02 -0800 (PST) Received: from localhost.localdomain ([72.53.228.194]) by smtp.gmail.com with ESMTPSA id s21-20020ac85cd5000000b003a55fe9f352sm8875521qta.64.2022.11.08.14.01.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Nov 2022 14:01:01 -0800 (PST) From: Sultan Qasim Khan X-Google-Original-From: Sultan Qasim Khan To: u-boot@lists.denx.de Cc: Sultan Qasim Khan Subject: [PATCH] dfu: bounds check USB upload and download sizes Date: Tue, 8 Nov 2022 16:58:51 -0500 Message-Id: <20221108215851.27170-1-sultan.qasimkhan@nccgroup.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 09 Nov 2022 01:22:35 +0100 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.6 at phobos.denx.de X-Virus-Status: Clean Also verify transfer directions match what is expected for the operation type. Addresses memory corruption and disclosure vulnerability CVE-2022-2347. Signed-off-by: Sultan Qasim Khan --- drivers/usb/gadget/f_dfu.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index e9340ff5cb..4a7057c529 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -323,7 +323,7 @@ static int state_dfu_idle(struct f_dfu *f_dfu, switch (ctrl->bRequest) { case USB_REQ_DFU_DNLOAD: - if (len == 0) { + if (len == 0 || len > DFU_USB_BUFSIZ || (ctrl->bRequestType & USB_DIR_IN)) { f_dfu->dfu_state = DFU_STATE_dfuERROR; value = RET_STALL; break; @@ -333,6 +333,11 @@ static int state_dfu_idle(struct f_dfu *f_dfu, value = handle_dnload(gadget, len); break; case USB_REQ_DFU_UPLOAD: + if (len > DFU_USB_BUFSIZ || (ctrl->bRequestType & USB_DIR_IN) != USB_DIR_IN) { + f_dfu->dfu_state = DFU_STATE_dfuERROR; + value = RET_STALL; + break; + } f_dfu->dfu_state = DFU_STATE_dfuUPLOAD_IDLE; f_dfu->blk_seq_num = 0; value = handle_upload(req, len); @@ -428,6 +433,11 @@ static int state_dfu_dnload_idle(struct f_dfu *f_dfu, switch (ctrl->bRequest) { case USB_REQ_DFU_DNLOAD: + if (len > DFU_USB_BUFSIZ || (ctrl->bRequestType & USB_DIR_IN)) { + f_dfu->dfu_state = DFU_STATE_dfuERROR; + value = RET_STALL; + break; + } f_dfu->dfu_state = DFU_STATE_dfuDNLOAD_SYNC; f_dfu->blk_seq_num = w_value; value = handle_dnload(gadget, len); @@ -515,6 +525,11 @@ static int state_dfu_upload_idle(struct f_dfu *f_dfu, switch (ctrl->bRequest) { case USB_REQ_DFU_UPLOAD: + if (len > DFU_USB_BUFSIZ || (ctrl->bRequestType & USB_DIR_IN) != USB_DIR_IN) { + f_dfu->dfu_state = DFU_STATE_dfuERROR; + value = RET_STALL; + break; + } /* state transition if less data then requested */ f_dfu->blk_seq_num = w_value; value = handle_upload(req, len);