From patchwork Tue Jul 25 12:49:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 125615 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2457875vqg; Tue, 25 Jul 2023 06:10:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlFTUfcETwa3YtSwABBvpfEglnQEMfwYDLp/W72LAn0Bb3TRn379oHjaYuv3nOsfyJT9u7Pb X-Received: by 2002:a17:90a:6a8d:b0:268:1b62:2f6c with SMTP id u13-20020a17090a6a8d00b002681b622f6cmr5547046pjj.2.1690290641844; Tue, 25 Jul 2023 06:10:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690290641; cv=none; d=google.com; s=arc-20160816; b=nJQIvKRlhCsyenohSWUCdPeYPlWI5fNhh3XEyOd/z29+2sA0+VR+xTZFcOeEIDM9OL 4f84uQd+pVPkFVX0QoZyevJ4sJ9DlAf5PYOdMta1DrOTR/L5gsP0T8PSlKNvXkv3X0E6 3SIUYU8v37VVqmRkog4x3IlAzOGWvAp0R2UPLhGHE/epYL25qonjQYDmlRfuY5jIZCHx 10UfcF5WVJ/2Np5iNZhT6422IVuRaiprO9j6c7dtKoM0NuuuzoDTtnavkr6uKQrarc8m 9rsJ9ap5yQhoJdSicat2Ug+Yb3E1qmFXK/S6LrXrV67H9oWO8GgTekZ1jqBnMmLxiq/r LiMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xD2BSNpw0ozN3thb1dtWBEB8CA/Y2iCKwoB9ihfmKUM=; fh=Sy2DcC8iBcoj93plRSksEF0esK794/0rw7KBx0/+VmQ=; b=inzWIL6thTceV9UkHW8YE71Yln+AFjuy9dR3dXzg3vPaU0zWrNlEornX1KvUSt5x1X zfimYeWB5ljqxv/pHd26LYk3yL/kJYmRhrX/3TliEPPtHEr4uq/ZyJZYy2NDdFPOzJ+J ySfLiLqy5hYOth4r9aOC0FxTADs8lG3oAMbVt+XXvcQv2tiyc+np3mz8mNM9v4uOpZx4 oHS0WRfsDgNbEoWCaN/TP/+KJ2/VMzR/T6Jo7oAVtr42aeAWN+RFZRgowTQS4XRY3fEZ 13hexElkvN+o0uv2c9c6KIq043LMCGP1YoC/HfWsWkr9cxWK6fPLOa1O5iddu8YOfcoS uBgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=CyA3oOnx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nn7-20020a17090b38c700b002630f1d7650si14694082pjb.46.2023.07.25.06.10.19; Tue, 25 Jul 2023 06:10:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=CyA3oOnx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232741AbjGYMuc (ORCPT + 99 others); Tue, 25 Jul 2023 08:50:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232406AbjGYMuA (ORCPT ); Tue, 25 Jul 2023 08:50:00 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66013C4 for ; Tue, 25 Jul 2023 05:49:59 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-99313a34b2dso803334966b.1 for ; Tue, 25 Jul 2023 05:49:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1690289398; x=1690894198; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xD2BSNpw0ozN3thb1dtWBEB8CA/Y2iCKwoB9ihfmKUM=; b=CyA3oOnxu6kKFadEHW0nl87UpGvrgxftxDTDoXqbGMsHE4Cg/jm0vshSVPLmZg+Zed ukEjtajE/L52c49bGBEIAY3AsizeBwaSoGR8qtTAsPBFfcyG2XjT5xl+l8DNURtesPd8 V4D/GiatML/j4CGnL2xwc/VZoPaJRz8MCd2pR8EhgcZKmv6XCnCfQRhRH4XOB33Gzz77 skKwgd7MtV57ot/CuiLGPhuD7SVLTrNUOLWwQmKmzDscrYb2qSHFePgeRlzItlF7HO+h fNXALOL+jVQ2mNzqFcQNFVB58Lz8h6AQv9IJUC9OX3sM18xuNiF+XFh6Y2yYRAp+BL7b ojaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690289398; x=1690894198; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xD2BSNpw0ozN3thb1dtWBEB8CA/Y2iCKwoB9ihfmKUM=; b=XYPg7qq3IB/Vvc/VslazLQ41ZeqK1gJmZowUd2HMlXITp6idLzS/irhPy9PuDbwZH4 WPZ9K2lc1y5M4NiQfvv5mxHOOVkbYj+R44haLDUtYsfBJ8bkhWSLWs70v94shicF3As8 zSPTGnvU0XEikZnKUU4zDF6zVGhBXE+o9EnpdUnu4ng0n/DUb3JGkmGZxCym34TmTty6 gX3S3YZ0AHi5CuQDlqewATVaLHrobULczz3BgDAtF4oxkQEUS25pShRIebX4YX0cH885 ZTwXTs+K5SgN95VUelZQJp4ZDY/2wRrxvjJllVAU2Xar4yzwHLyvbCaDV9Zk7qijdPZI ipfQ== X-Gm-Message-State: ABy/qLbTXqRTVXgK+ly9vVuvna2uG35Bp5vAzA3PY4BXWg9wHtuSJrvy j9RUzrucZNy795i+wTtNoJaWTA== X-Received: by 2002:a17:906:76d0:b0:991:d05c:f065 with SMTP id q16-20020a17090676d000b00991d05cf065mr13329973ejn.52.1690289398013; Tue, 25 Jul 2023 05:49:58 -0700 (PDT) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id pk15-20020a170906d7af00b00997e8b6eaa1sm8133283ejb.41.2023.07.25.05.49.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 05:49:57 -0700 (PDT) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: Guenter Roeck , linux-hwmon@vger.kernel.org, Jean Delvare Cc: Patrick Rudolph , Naresh Solanki , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] pmbus_core: Fix NULL pointer dereference Date: Tue, 25 Jul 2023 14:49:51 +0200 Message-ID: <20230725124954.3824954-2-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230725124954.3824954-1-Naresh.Solanki@9elements.com> References: <20230725124954.3824954-1-Naresh.Solanki@9elements.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772398199925599456 X-GMAIL-MSGID: 1772398199925599456 From: Patrick Rudolph Pass i2c_client to _pmbus_is_enabled to drop the assumption that a regulator device is passed in. This will fix the issue of a NULL pointer dereference when called from _pmbus_get_flags. Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki --- drivers/hwmon/pmbus/pmbus_core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 42fb7286805b..1f7df36c48a8 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -2745,9 +2745,8 @@ static const struct pmbus_status_category __maybe_unused pmbus_status_flag_map[] }, }; -static int _pmbus_is_enabled(struct device *dev, u8 page) +static int _pmbus_is_enabled(struct i2c_client *client, u8 page) { - struct i2c_client *client = to_i2c_client(dev->parent); int ret; ret = _pmbus_read_byte_data(client, page, PMBUS_OPERATION); @@ -2758,14 +2757,13 @@ static int _pmbus_is_enabled(struct device *dev, u8 page) return !!(ret & PB_OPERATION_CONTROL_ON); } -static int __maybe_unused pmbus_is_enabled(struct device *dev, u8 page) +static int __maybe_unused pmbus_is_enabled(struct i2c_client *client, u8 page) { - struct i2c_client *client = to_i2c_client(dev->parent); struct pmbus_data *data = i2c_get_clientdata(client); int ret; mutex_lock(&data->update_lock); - ret = _pmbus_is_enabled(dev, page); + ret = _pmbus_is_enabled(client, page); mutex_unlock(&data->update_lock); return ret; @@ -2844,7 +2842,7 @@ static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flag if (status < 0) return status; - if (_pmbus_is_enabled(dev, page)) { + if (_pmbus_is_enabled(client, page)) { if (status & PB_STATUS_OFF) { *flags |= REGULATOR_ERROR_FAIL; *event |= REGULATOR_EVENT_FAIL;