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 2F4A0EEB565 for ; Sat, 9 Sep 2023 00:41:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244527AbjIIAlB (ORCPT ); Fri, 8 Sep 2023 20:41:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345902AbjIIAkG (ORCPT ); Fri, 8 Sep 2023 20:40:06 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6455A2D56; Fri, 8 Sep 2023 17:39:20 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 604B3C4339A; Sat, 9 Sep 2023 00:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694219957; bh=lD0W62Gb89XMInZipeZtZ+rDmFvBX28Qm4aq9zgBHK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DnlkLjPUKjLz25cY4tgsDU84XYkbPa3lvxbvMwTHItxBpDSUipe3IoxgZdLLkGL5F 4rqfr3Q9XFHgJErSI2DTgr1E8ftrjc3SnHlLhmNIa5K3zK6FMpiXhx+HoitjfKqosm 8BaWG1DgRYNUoE4/qVuIMmMgKWRi7dT0skaNiQ3NoHGBErnqVVB4nGWVWpWgrNmI66 OXZhwHn9w3D70H/5SOcV0Y2FMIlnbN21xgAFB0MVp6NTDu6owZN5r+r4jhHXzBkDwF crhdTFW6n0sMekl3akZxFP409uKuTOHJICURoy+iA6tXAZTQFYqzxWf+Ig6X6E2zmv +xTYDUef6lHKg== 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 5.15 06/19] media: dvb-usb-v2: gl861: Fix null-ptr-deref in gl861_i2c_master_xfer Date: Fri, 8 Sep 2023 20:38:50 -0400 Message-Id: <20230909003903.3580394-6-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230909003903.3580394-1-sashal@kernel.org> References: <20230909003903.3580394-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.131 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhang Shurong [ Upstream commit b97719a66970601cd3151a3e2020f4454a1c4ff6 ] In gl861_i2c_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 gl861_i2c_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 Signed-off-by: Sasha Levin --- drivers/media/usb/dvb-usb-v2/gl861.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/usb/dvb-usb-v2/gl861.c b/drivers/media/usb/dvb-usb-v2/gl861.c index 0c434259c36f1..c71e7b93476de 100644 --- a/drivers/media/usb/dvb-usb-v2/gl861.c +++ b/drivers/media/usb/dvb-usb-v2/gl861.c @@ -120,7 +120,7 @@ static int gl861_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], } else if (num == 2 && !(msg[0].flags & I2C_M_RD) && (msg[1].flags & I2C_M_RD)) { /* I2C write + read */ - if (msg[0].len > 1 || msg[1].len > sizeof(ctx->buf)) { + if (msg[0].len != 1 || msg[1].len > sizeof(ctx->buf)) { ret = -EOPNOTSUPP; goto err; } -- 2.40.1