From patchwork Sat Jun 18 22:22:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 84205 X-Patchwork-Delegate: sakari.ailus@iki.fi Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1o2gq0-009Znl-58; Sat, 18 Jun 2022 22:22:40 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232876AbiFRWWi (ORCPT + 1 other); Sat, 18 Jun 2022 18:22:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230124AbiFRWWh (ORCPT ); Sat, 18 Jun 2022 18:22:37 -0400 Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F04F210FFE for ; Sat, 18 Jun 2022 15:22:36 -0700 (PDT) Received: from tr.lan (ip-86-49-12-201.net.upcbroadband.cz [86.49.12.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 8E24083F6A; Sun, 19 Jun 2022 00:22:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1655590955; bh=9GDcV2pyoyiMhRhNeeZr3Zjxdw3TVaZIVVpvCXMoBrc=; h=From:To:Cc:Subject:Date:From; b=wa8K7cI8TYT8NeOEo6RxtnriVXUhMAKUc/voUKnkbk08iC1cSlE5/jBI2EqodgI2R BdgYdhHPmI1l872qTdrThgACd1yX9S6eVwlDob4GIOtOwMqYW7GoKMWlgIenVZMVRA A4RuWo7Yb/mSH6xTf4iKNWrjq0X4yw4pw5Z6uepkM4qbQTUB5h1XWafhWIcaOHD3NP gBxP/st7gBwMOwkeuwOziS2S46hE4MHDXdFGmmWU/RgkahnzWjFvncsYoXGySiW9IM 5Lq8ntUw5BSwDaYA5nR+nWG8D92eLeV/Iz64iwKfeHbJuOZln1NKnGKIRrem5903v9 fBcG8oi2wGGug== From: Marek Vasut To: linux-media@vger.kernel.org Cc: Marek Vasut , Laurent Pinchart , Mauro Carvalho Chehab , Sakari Ailus , Stefan Riedmueller Subject: [PATCH] media: mt9p031: Check for non-null I2C ID match Date: Sun, 19 Jun 2022 00:22:32 +0200 Message-Id: <20220618222232.478138-1-marex@denx.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.5 (--) X-LSpam-Report: No, score=-2.5 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no The const struct i2c_device_id *did passed to probe may be NULL e.g. in case DT contains the following compatible string: compatible = "aptina,mt9p006", "aptina,mt9p031"; Check the variable for non-NULL and fail gracefully instead of crashing the kernel outright with NULL pointer dereference splat. Signed-off-by: Marek Vasut Cc: Laurent Pinchart Cc: Mauro Carvalho Chehab Cc: Sakari Ailus Cc: Stefan Riedmueller --- drivers/media/i2c/mt9p031.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index e0f0d87d4cfe9..d0706723e493c 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -1106,6 +1106,11 @@ static int mt9p031_probe(struct i2c_client *client, return -EINVAL; } + if (did == NULL) { + dev_err(&client->dev, "Invalid I2C device ID\n"); + return -EINVAL; + } + if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) { dev_warn(&client->dev, "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n");