From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB5D3C433FE for ; Tue, 1 Mar 2022 20:21:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238077AbiCAUWQ (ORCPT ); Tue, 1 Mar 2022 15:22:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238111AbiCAUVw (ORCPT ); Tue, 1 Mar 2022 15:21:52 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CA8B8F98E; Tue, 1 Mar 2022 12:19:13 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0FDD76178E; Tue, 1 Mar 2022 20:19:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E80DC340EE; Tue, 1 Mar 2022 20:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646165945; bh=XsgHyqj2okdfPhOMiAGj82y/sLCkNcNtxU6ybJEYbuI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YkbZi1wDF0qH6jcYoc0BY6wmuc79WJQOmfNaNC0CFplrUANsRVNkYEHtrK8EXZx6O lBMqrgkcO2oEIt/hd+cpRFzkP0YLNuMW74mLTRvxOoRGOYlfTYnhY6Zy3iRDJnkBLD VXVPwMe7WM5Yr2rnOpkFjoXCmQ4mzOTZNMLHbOQ1ykx/5jgT7eUjIaHU/N96qqlF8Q OkdOKFxQIKf/Pz4k7YQcnYfR8Jm+xlRnjujQYKdWbhcsgo06MWUZPZ9PqtLkBrKmdM 3cdaQrGKtkcpkM3tjzFUk7yIE5QSI3wdy/7IYhf/zzaQSVrjNtlfd4t9FLfcmp95cQ XAvtVX6QpL9nQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oliver Neukum , Grant Grundler , "David S . Miller" , Sasha Levin , kuba@kernel.org, andrew@lunn.ch, jgg@ziepe.ca, arnd@arndb.de, linux-usb@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 06/14] sr9700: sanity check for packet length Date: Tue, 1 Mar 2022 15:18:18 -0500 Message-Id: <20220301201833.18841-6-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220301201833.18841-1-sashal@kernel.org> References: <20220301201833.18841-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Oliver Neukum [ Upstream commit e9da0b56fe27206b49f39805f7dcda8a89379062 ] A malicious device can leak heap data to user space providing bogus frame lengths. Introduce a sanity check. Signed-off-by: Oliver Neukum Reviewed-by: Grant Grundler Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/sr9700.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/usb/sr9700.c b/drivers/net/usb/sr9700.c index e04c8054c2cf3..fce6713e970ba 100644 --- a/drivers/net/usb/sr9700.c +++ b/drivers/net/usb/sr9700.c @@ -410,7 +410,7 @@ static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb) /* ignore the CRC length */ len = (skb->data[1] | (skb->data[2] << 8)) - 4; - if (len > ETH_FRAME_LEN) + if (len > ETH_FRAME_LEN || len > skb->len) return 0; /* the last packet of current skb */ -- 2.34.1