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 CE670EEB57C for ; Sat, 9 Sep 2023 01:13:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236605AbjIIBN2 (ORCPT ); Fri, 8 Sep 2023 21:13:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343716AbjIIBN1 (ORCPT ); Fri, 8 Sep 2023 21:13:27 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8462F2121; Fri, 8 Sep 2023 18:13:01 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4A205C116A9; Sat, 9 Sep 2023 00:37:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694219849; bh=ErhirofyQSlMNxPBuSUuI8Egcmidvj8SE7c7pI5yQFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c0Uv0oxmMxJyQCmogCy8HYEhShe/kPd9yHJBttnWE7bXjEDekzqLxdJdLU4Wkos7+ khBilfogXC9v9Jtya5O9po8QcUJ6NLBtYPNk4VA5iK5FijLJHYs0ep41Ii4+CuzA7F 4X5k1ZWe0+hZLCAw8a5HvecfOaqo+m+heMcwhp0OJgXp2qpk1kM0+lKykA/dpoGcsT mMbGVhhayLXhpgu5g44TmvYsymSDwWLI3bZzP2rtrpoHlXHKKUdXYp2WtHpbl1VvUx D8aM8NSID9dLNI/1Svg9ZC3LmbemwA6QkhzgFaYq5abvYVrAYPQHQpeUtYdrZXAPIp vX1jECY2/F5Sg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Shurong , Hans Verkuil , Sasha Levin , mchehab@kernel.org, linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 6.4 06/25] media: az6007: Fix null-ptr-deref in az6007_i2c_xfer() Date: Fri, 8 Sep 2023 20:36:54 -0400 Message-Id: <20230909003715.3579761-6-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 1047f9343011f2cedc73c64829686206a7e9fc3f ] In az6007_i2c_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 az6007_i2c_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/az6007.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/media/usb/dvb-usb-v2/az6007.c b/drivers/media/usb/dvb-usb-v2/az6007.c index 7524c90f5da61..6cbfe75791c21 100644 --- a/drivers/media/usb/dvb-usb-v2/az6007.c +++ b/drivers/media/usb/dvb-usb-v2/az6007.c @@ -788,6 +788,10 @@ static int az6007_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], if (az6007_xfer_debug) printk(KERN_DEBUG "az6007: I2C W addr=0x%x len=%d\n", addr, msgs[i].len); + if (msgs[i].len < 1) { + ret = -EIO; + goto err; + } req = AZ6007_I2C_WR; index = msgs[i].buf[0]; value = addr | (1 << 8); @@ -802,6 +806,10 @@ static int az6007_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], if (az6007_xfer_debug) printk(KERN_DEBUG "az6007: I2C R addr=0x%x len=%d\n", addr, msgs[i].len); + if (msgs[i].len < 1) { + ret = -EIO; + goto err; + } req = AZ6007_I2C_RD; index = msgs[i].buf[0]; value = addr; -- 2.40.1