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 D8C62C433EF for ; Tue, 1 Mar 2022 20:15:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237765AbiCAUQ2 (ORCPT ); Tue, 1 Mar 2022 15:16:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237850AbiCAUQB (ORCPT ); Tue, 1 Mar 2022 15:16:01 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C5D87DE19; Tue, 1 Mar 2022 12:15:12 -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 1620461638; Tue, 1 Mar 2022 20:15:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8DCDC340EF; Tue, 1 Mar 2022 20:15:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646165711; bh=4N2J2oR8S/J4fVumM5U4WBjdvr38F3mQKilEvTjAQq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gUNaar6GUcdLc/7DRJk4kt9kVbXl7qSD0x3FEct/r4QjXgmoEYzPw4csF8lVp4fpT qwdUuDjn4Iy+FVAVtMk5aWe5LxNzQt8Pbtjj/MQd4WY6o9KFi4ZwVvsfpFmvq7Ek50 xog6Z/uwpOCvd0Xx3NZqnueRq1DUSSbvEtDPPz1z1FDdOa4LHncfyKnx/P+Q3gvDGS +7fccYf1ILqZPdISk2qC2iHU4zzwFcrFHKB+UJbBAmm1Km6hnPStfyuOeCtRidpnXG BaNjzSh6vB8vgh+yVKBB8Srt+nwtRwZ5kBbFKwp3Fml33YRPP0QX9fe7mOn8NnBY3h JE2qN+bexWDUA== 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, jgg@ziepe.ca, arnd@arndb.de, linux-usb@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.16 15/28] sr9700: sanity check for packet length Date: Tue, 1 Mar 2022 15:13:20 -0500 Message-Id: <20220301201344.18191-15-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220301201344.18191-1-sashal@kernel.org> References: <20220301201344.18191-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: stable@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 b658510cc9a42..5a53e63d33a60 100644 --- a/drivers/net/usb/sr9700.c +++ b/drivers/net/usb/sr9700.c @@ -413,7 +413,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