From patchwork Fri Sep 29 15:42:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 146650 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp4132476vqu; Fri, 29 Sep 2023 08:51:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHFcu+k7+G0xyHJ3r01sb7fvquyzyjbLX3XfrcwAt3uvy+bMeSxUUqYmmL7uLTgzcLxREla X-Received: by 2002:a17:90b:4c4a:b0:273:efde:2ea4 with SMTP id np10-20020a17090b4c4a00b00273efde2ea4mr4170073pjb.42.1696002717553; Fri, 29 Sep 2023 08:51:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696002717; cv=none; d=google.com; s=arc-20160816; b=C+sKZ3zhz91+phYzN2hXrUvNFOcR4sS1PsXOqgkq3zZVKTxi7btq/QtE80PI11C5Oq McckulerImMu7jzSwt4lTkqm/Dq87O1dYUPSZAKAAaVbKtprndB36Wwvk1k9kx1AG4gf Xpv/y4XHEcslD07BbYmKutb9Zmdqdc0fqwzOExYvaO03zbmjNMvqWlYX7bW6z+cHyjAr rBzpv53koViQFayaxhcgX1q6MW0/0YdDwyJeWbtT+TfWllQvfF7rQhStJ0jgaQ5vjOyT NTBQEwa7X31NKCqg9BoR78cthvfSn9+sulRfgPku6zuCo+a4+SZ9Vs1EhTzEXfN6SB3Z cR8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=uOPs4EUHfnVo2omkbOBofCrQGdPw+8pqW8uH/7g4da4=; fh=1OOGcO1ZhdybBJfhSEabRjpXFVYgqlbzcX4OaOHoIlg=; b=iVVzGQlyZlXcewTol8aFsHpOh4AV0Sz1qr3cPtlK+tP98ko0Sk7O1iJ1/WpnNrmlNR hX8J1Y6u4RwFM0xDfr0QBaM9Kyi3EgRFPrtXPtRkYvvi3/20E7JBshjy62q/yzKN1T1B ERogK/vsoms/3d4FFINLzjmZLa/v1YELMFonOOyrM3EbHa0SGQVRRoDipwfFxivO9UWS D8igkvBLKZQ1kZOLw7d55y0g05zDbAsDMGP28pjZKKd0auz6j5O5zOahYMSf8Hchb7Xk AmKEvGySSoTDADxWebGjk8A4OTmJ0hw8sCIKGTRjO+6sH97/dJtToopmtL2hjvKbCoRk YGIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qyDMdW5b; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id cq13-20020a17090af98d00b002791bfc67bdsi1774282pjb.41.2023.09.29.08.51.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 08:51:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qyDMdW5b; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 8D3628331E22; Fri, 29 Sep 2023 08:42:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233505AbjI2PmU (ORCPT + 20 others); Fri, 29 Sep 2023 11:42:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231429AbjI2PmT (ORCPT ); Fri, 29 Sep 2023 11:42:19 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D3A8B4; Fri, 29 Sep 2023 08:42:17 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69593C433C7; Fri, 29 Sep 2023 15:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696002136; bh=Zl9IzDfJ74tSHG7Bo3AkrSgoNzTjNILJUvTaD+C2hpM=; h=Date:From:To:Cc:Subject:From; b=qyDMdW5b+k9YsTcDHVa6jtbOihi/nlM/xncg5bZPJCRQEuUEtK6jXE+OoW58OSQKD ZgwbxqXxdZAEhgaBpWo1c6XxZXkhcZxQDzvkVFpR2DU9DUyFLlUaKG82/Y8YTNd8xi O0d0hVUy/uqd4PbDUTXeIbpEcm8etsmdMnXgFmi3YG/Rq2A8LhFPDcVj5uCKaLcWOc ohsuJ5/hPAQT39aQW/NCjmO153g/RPL8acTQLExpvutAuJQEAvtDUH8TEmcY4LJcTv rMg8SZZn5zoIF+WcA/LUJT8UlLl173AXx+XZ1ysj4XwrpKtIvsUSoTcTAcC9B13QIb /KAO3+pqJztOQ== Date: Fri, 29 Sep 2023 17:42:11 +0200 From: "Gustavo A. R. Silva" To: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH][next] media: usb: siano: Fix undefined behavior bug in struct smsusb_urb_t Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 29 Sep 2023 08:42:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778387745608511266 X-GMAIL-MSGID: 1778387745608511266 `struct urb` is a flexible structure, which means that it contains a flexible-array member at the bottom. This could potentially lead to an overwrite of the object `wq` at run-time with the contents of `urb`. Fix this by placing object `urb` at the end of `struct smsusb_urb_t`. Fixes: dd47fbd40e6e ("[media] smsusb: don't sleep while atomic") Cc: stable@vger.kernel.org Signed-off-by: Gustavo A. R. Silva Reviewed-by: Kees Cook --- drivers/media/usb/siano/smsusb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c index 9d9e14c858e6..2c048f8e8371 100644 --- a/drivers/media/usb/siano/smsusb.c +++ b/drivers/media/usb/siano/smsusb.c @@ -40,10 +40,10 @@ struct smsusb_urb_t { struct smscore_buffer_t *cb; struct smsusb_device_t *dev; - struct urb urb; - /* For the bottom half */ struct work_struct wq; + + struct urb urb; }; struct smsusb_device_t {