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 197C8EEB57A for ; Sat, 9 Sep 2023 00:38:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345690AbjIIAiS (ORCPT ); Fri, 8 Sep 2023 20:38:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345707AbjIIAiH (ORCPT ); Fri, 8 Sep 2023 20:38:07 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8645C26AB; Fri, 8 Sep 2023 17:37:45 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1CDBC433CD; Sat, 9 Sep 2023 00:37:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694219847; bh=PoqB7G9Vfikam0GR9KERBfdi5X+OnD1jcrHBQlZ5In4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ovNhHL15b2nxjtlsBg03QOBYIdbSj1c9uhcrO9m18xEo492SaTXV5qPdFSTXBj5IB R/APYCfGUjrnFnTdV8v2RXuN7VNINQNuQmh0NsatWesLiu3QOr9ylbPyvwn03TgfZg O/DzPtSldDMgFZ/RtVyAB98yzIcqVcKCpxViohWRLv89E1N4b8RoJpRAo/RWJ+qPr6 meAoJlJgfWO8JTDnYfebmJkinMRaLVdIBtjKv2rGQ/wheIjauWQkymt0/ZlS/IEixw 3s/YCTOQZSdq1E9QZK1xyIAwSQX5M5+fXnxHaawuSmNk3jDFKj5R0UjdpkqPVqE8Ua syLZLUTIqhqcQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Shurong , Hans Verkuil , Sasha Levin , crope@iki.fi, mchehab@kernel.org, linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 6.4 05/25] media: anysee: fix null-ptr-deref in anysee_master_xfer Date: Fri, 8 Sep 2023 20:36:53 -0400 Message-Id: <20230909003715.3579761-5-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230909003715.3579761-1-sashal@kernel.org> References: <20230909003715.3579761-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.15 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhang Shurong [ Upstream commit c30411266fd67ea3c02a05c157231654d5a3bdc9 ] In anysee_master_xfer, msg is controlled by user. When msg[i].buf is null and msg[i].len is zero, former checks on msg[i].buf would be passed. Malicious data finally reach anysee_master_xfer. If accessing msg[i].buf[0] without sanity check, null ptr deref would happen. We add check on msg[i].len to prevent crash. Similar commit: commit 0ed554fd769a ("media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer()") Signed-off-by: Zhang Shurong Signed-off-by: Hans Verkuil [hverkuil: add spaces around +] Signed-off-by: Sasha Levin --- drivers/media/usb/dvb-usb-v2/anysee.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/usb/dvb-usb-v2/anysee.c b/drivers/media/usb/dvb-usb-v2/anysee.c index aa45b5d263f6b..a1235d0cce92f 100644 --- a/drivers/media/usb/dvb-usb-v2/anysee.c +++ b/drivers/media/usb/dvb-usb-v2/anysee.c @@ -202,7 +202,7 @@ static int anysee_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, while (i < num) { if (num > i + 1 && (msg[i+1].flags & I2C_M_RD)) { - if (msg[i].len > 2 || msg[i+1].len > 60) { + if (msg[i].len != 2 || msg[i + 1].len > 60) { ret = -EOPNOTSUPP; break; } -- 2.40.1