Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp1040125pxa; Sat, 1 Aug 2020 15:03:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwx8qgTud0ygB7M+7HuVuJcJoGccDRjDoY8vcHGanNwoIaNwYBZriokWDLB/zmsIrIM694t X-Received: by 2002:a17:906:d930:: with SMTP id rn16mr10448644ejb.330.1596319380643; Sat, 01 Aug 2020 15:03:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596319380; cv=none; d=google.com; s=arc-20160816; b=ftGkT82Q13jWQG46RjCe8ycjnT+RfWhaTXtl6Fz/dTp66RetYaMhUj0ENmSO9J77JC gUeK1TfOzPwDi/UepYLdrac6t9tqOT+V6l0H1ScMONXu+4h96lw1z4P+z4vcHTjZ/tDc vk/yGJKPTqwZFinIP9FSMxGUDzrZ7igR1NlubaK+rAnCIRQ6waNbNQtl626mTZ2HGFvV 8U7Yr2eaQbHibD5FEQ9zXLxu7OQEU4ivCg28TX9CqXcUSeq1dyyKU9xpwKfdIjbbx8OF F9sxJ3JcUAr/1AQUH29FyH/Gwh8VxhXxwS2sqHG7+xiHY7LJdDdPtZUUldlHPvB3Fucw 6r4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=UVIWIxZhptK6Lg0G/AVQAekYv15O4O2WoJ9af+aMngA=; b=DAZXsu6UtetgqfeGpG6rzywN1x6nX6Y0LIFCXdxQkhQwEKRrKOrvXZ9kS6IJqXgHy0 q1Y6Q1EWw1PFbxKUDPf6Hd7o9haiO6pPoo3mD1aCezmQbV4Hw3dFlk7cUBsuM7G6YnRG 88xWsLtnJN530uc991/uBOjw/+D3RsUpJL7pqwX3HhtjwI41AJ5gMPjORvX+A6YkkDGc p96XWDQ2cJV4PrrV8O/60ajLrMofxS9ABFGrXgg/PVlUqmZFt5MIT/r6bO+KyzUTDQZm 17HaUDcZ2hysBATWLWATvNGb5PGLbkO+flcQubOL4RNugzR7vo3I8Z2a3xY/5qK4rbe4 UEpg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p6si2847303ejd.617.2020.08.01.15.02.39; Sat, 01 Aug 2020 15:03:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726999AbgHAWCY (ORCPT + 99 others); Sat, 1 Aug 2020 18:02:24 -0400 Received: from relay12.mail.gandi.net ([217.70.178.232]:33657 "EHLO relay12.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726748AbgHAWCY (ORCPT ); Sat, 1 Aug 2020 18:02:24 -0400 Received: from localhost.localdomain (unknown [178.240.22.159]) (Authenticated sender: cengiz@kernel.wtf) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 7B83E200008; Sat, 1 Aug 2020 22:02:17 +0000 (UTC) From: Cengiz Can To: andy.shevchenko@gmail.com Cc: cengiz@kernel.wtf, dan.carpenter@oracle.com, devel@driverdev.osuosl.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, mchehab@kernel.org, sakari.ailus@linux.intel.com Subject: [PATCH v6] staging: atomisp: move null check to earlier point Date: Sun, 2 Aug 2020 01:01:02 +0300 Message-Id: <20200801220101.2783-1-cengiz@kernel.wtf> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200731083856.GF3703480@smile.fi.intel.com> References: <20200731083856.GF3703480@smile.fi.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org `find_gmin_subdev()` that returns a pointer to `struct gmin_subdev` can return NULL. In `gmin_v2p8_ctrl()` there's a call to this function but the possibility of a NULL was not checked before its being dereferenced, i.e.: /* Acquired here --------v */ struct gmin_subdev *gs = find_gmin_subdev(subdev); /* v------Dereferenced here */ if (gs->v2p8_gpio >= 0) { ... } With this change we're null checking `find_gmin_subdev()` result and we return an error if that's the case. We also WARN() for the sake of debugging. Signed-off-by: Cengiz Can Reported-by: Coverity Static Analyzer CID 1465536 Suggested-by: Mauro Carvalho Chehab --- Please do note that this change introduces a new return value to `gmin_v2p8_ctrl()`. [NEW] - raise a WARN and return -ENODEV if there are no subdevices. - return result of `gpio_request` or `gpio_direction_output`. - return 0 if GPIO is ON. - return results of `regulator_enable` or `regulator_disable`. - according to PMIC type, return result of `axp_regulator_set` or `gmin_i2c_write`. - return -EINVAL if unknown PMIC type. Patch Changelog: v4: Fix minor typo in commit message v5: Remove typo from email subject v6: Remove duplicate Signed-off-by tag drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c index 0df46a1af5f0..1ad0246764a6 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c +++ b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c @@ -871,6 +871,9 @@ static int gmin_v2p8_ctrl(struct v4l2_subdev *subdev, int on) int ret; int value; + if (WARN_ON(!gs)) + return -ENODEV; + if (gs->v2p8_gpio >= 0) { pr_info("atomisp_gmin_platform: 2.8v power on GPIO %d\n", gs->v2p8_gpio); @@ -881,7 +884,7 @@ static int gmin_v2p8_ctrl(struct v4l2_subdev *subdev, int on) pr_err("V2P8 GPIO initialization failed\n"); } - if (!gs || gs->v2p8_on == on) + if (gs->v2p8_on == on) return 0; gs->v2p8_on = on; -- 2.27.0