From patchwork Tue Jul 25 12:49:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 125626 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2480762vqg; Tue, 25 Jul 2023 06:46:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlGNY/FpuvRaItn6yyijsGOKTo8yfQ5Y+iGTfw1pYhXIfjenqjn9susJoBRVem6WBXvHENOb X-Received: by 2002:a05:6a20:117:b0:133:ee16:567f with SMTP id 23-20020a056a20011700b00133ee16567fmr9573582pzr.13.1690292762574; Tue, 25 Jul 2023 06:46:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690292762; cv=none; d=google.com; s=arc-20160816; b=i0GbwdHEZs0OAJbvvUSmhlrZdtaZrbeAgs+bOfrjExDRcR5mUArDbsf3N3ItWCPlUI tZaWHK+xYDavTrMV73UQ2DKbMZScX8RhogEBVbQAubgXK2G8wwzbTAP8/Zi2A9fMBYmp cqNllFjZ6XNA7adRe6jpYqCXhl3l2wUJH0OBrFs1+lW4vb6EUOkZZzcG//nN9ZUVLDAi eD6Gl/rNNdyNjvyVxvWQ8uNixCgsohy0eLYvLv5D6FW4unYkVDxZSeqUZhBwaeazQGs9 PIUqGaGPCHkLeBvGgoZ9TmP4Q8/nI5VrXXvXfHOjMkg0/OJWVM0dsH45ONcdnQXItAzR 5HGw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=3Puz3ztq+s5PMQIYSFqmtMplo+slwUgkmSW9O9rbzaQ=; fh=Sy2DcC8iBcoj93plRSksEF0esK794/0rw7KBx0/+VmQ=; b=hqEzAy+w3s4ZyJsFLt4eisNlb8/3O3Gz2dgLBw+4Sg4uiqtJ4zFu8ggPR2k7tkZfGx QTfKCYOc5W3ZQP31wxYwhQvJlZJ2lNRXhe+bN1YNR6EPuUibd3l6hKdP2ElwmtCmMlg3 vB7ZMwdMjS97KiUhTa/jj4V5m6sOVktoe2FA0SXQUOtX06JNEvIsw3HF5QWcgIpOcODL r7QdzJ7ms9drlPrXkqpewcK8jOLoeYDUGVGahtzpKVhXIKJrY8o4uApIdi7rLtPAXD9f zekdZwOa5T0GGMeH5KOazXx8pD4dvf6elnK6CDTVp8z5gyeJ9DxcN2U1CymRxDWTIvtD gnLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b="hVigPGX/"; 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 cm9-20020a056a00338900b00666887b7eecsi11295744pfb.312.2023.07.25.06.45.47; Tue, 25 Jul 2023 06:46:02 -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="hVigPGX/"; 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 S232686AbjGYMua (ORCPT + 99 others); Tue, 25 Jul 2023 08:50:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232317AbjGYMt7 (ORCPT ); Tue, 25 Jul 2023 08:49:59 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E85C1AA for ; Tue, 25 Jul 2023 05:49:58 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-977e0fbd742so874666766b.2 for ; Tue, 25 Jul 2023 05:49:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1690289397; x=1690894197; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3Puz3ztq+s5PMQIYSFqmtMplo+slwUgkmSW9O9rbzaQ=; b=hVigPGX//gTdtgmRuslLbiD1/zcY/J9BI9iISd0U4KzwumlLvSTCrKq4TVJCmKI5+Y gzNDIQRzCKFPphY9vbQsCB8Y0OcWy802EvA7wpSi8njOBNCZyNsNx/TovT71NWTTal0M 6zJrn0OCpMUMog1LoXLLbfPPloeuSf5Cq8Uahs3w58Hu2gJWKIe3wuYNrb7kmA1Az+r8 7FksdF0bC/1r8yXmfBqwolspgGX32xjGunx2VBJr1MCnDU3TgC0/DZjGxFrO0qaQHvOl 5etfhfrRaDodt9q7a6NlRCuoNzeq16P4nKo/Z8ODRTBH31SSfxr53sAIi+ClzWSGRUMT jStg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690289397; x=1690894197; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3Puz3ztq+s5PMQIYSFqmtMplo+slwUgkmSW9O9rbzaQ=; b=hZqjNWzoMkL8KYHut0nNJQ7Dv5CBY+Me+EVLZussicORR8/ga0ofwZSHBPeH3HGs7u cyrBFLlM6M3fAQQ9ihj/1o+sarMmWfkf/32aB8YUHlJdfYn2UAf7GQ5iy8NUsZ1uElIT Z3xcjifUMuu2y1PbxlTrwcgEd+A/56Iz+Quyxxmd/neWYHUZzGAxvUmkqEO1ldf/0x6N zkZluMnXTL3joztj/r3RTM6uiG1A0wcXbLByAYEQxWPpFCoefNL2MXTor0Qf3QNwRxfD w+d/d4toBUTZiAXFnVnW1ySqLBgOU9DfDa6jQvPacdE3CG6D+4xpwHE4vfTvSImxoz8i iy2w== X-Gm-Message-State: ABy/qLal9Goqk/8PdQwMAQpXvs9QvRvL6L2sH8JdixWUTw8YHdLNb+D5 WMiSImhKMSVAPvizDUyTzf4VsQ== X-Received: by 2002:a17:906:2d9:b0:973:d076:67ab with SMTP id 25-20020a17090602d900b00973d07667abmr12076828ejk.42.1690289396804; Tue, 25 Jul 2023 05:49:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 05:49:56 -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 1/3] pmbus_core: Refactor pmbus_is_enabled function Date: Tue, 25 Jul 2023 14:49:50 +0200 Message-ID: <20230725124954.3824954-1-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.41.0 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=unavailable 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: 1772398968962614895 X-GMAIL-MSGID: 1772400423408032772 From: Patrick Rudolph Refactor the pmbus_is_enabled() function to return the raw status without any additional processing as its already done in _pmbus_is_enabled function. Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki --- drivers/hwmon/pmbus/pmbus_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 55612007f16b5d7b1fb83a7b0f5bb686829db7c7 diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index fa06325f5a7c..42fb7286805b 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -2768,7 +2768,7 @@ static int __maybe_unused pmbus_is_enabled(struct device *dev, u8 page) ret = _pmbus_is_enabled(dev, page); mutex_unlock(&data->update_lock); - return !!(ret & PB_OPERATION_CONTROL_ON); + return ret; } #define to_dev_attr(_dev_attr) \ 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; From patchwork Tue Jul 25 12:49:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 125619 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2472919vqg; Tue, 25 Jul 2023 06:32:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlFaJ3+5nL5z+dVX7end4/NExKUYIECxqN1CIcecpcifwLzOhf7tACoRBdPdsiPH31pR6Em8 X-Received: by 2002:a05:6a00:1805:b0:686:b5c9:c527 with SMTP id y5-20020a056a00180500b00686b5c9c527mr860826pfa.17.1690291950846; Tue, 25 Jul 2023 06:32:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690291950; cv=none; d=google.com; s=arc-20160816; b=UpTauAua3w5AHxKJEj7Q0LiUj/3ffTYNP294GImryurLQbUwP82npKdn3eOTFx6HZO nOoKvUjMkMJqDNFGeBLqZh8F9/NIBCKLCRwLfVgK0IVSwPmN2cd9KLsaJK5H14+cOe/p HjQM2UwJ83CpjnJewZDQP/ApJKsESDvUXnvhyDSlqAZVySlSTU6NuLoHBN36RrQfIiXm 4DMAk8d6a9NFwAo/POYhlA5qOjEoACzNZ+oVzTeZkiCMbEbTm3irDbeB26UdY5RyW4sI v3y5yH++tq8hko1qzYGL64inoPOh5bSi/N5QNrT0rxre+LmB+f1XfSVEkewG0+SSHO5T ZYQw== 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=hYD19a3O4cLr2nNRYtCL9dvjJwOe0PKsrRBMJLYvYmk=; fh=Sy2DcC8iBcoj93plRSksEF0esK794/0rw7KBx0/+VmQ=; b=p1aZXFqPHR5hokT3jjylytuQIJs9XAIlCfiVLNbkuFZp2ZoARv77U0/BnS+BQfxuBW ODFAgRISW2WPfxffw1wvvdZ75YdNKoz0x8cD2U9YXv6e7LeGFeyfXJrKqcZ0Dr6LU/GQ svkBQN2a4pjKqEthbdgn3MANHgMhT8YiNCoFCy+hFSghgBB5xjMruBRjsXNl2qGW8amg Ng+iMHtiGXBhKkEgWwMEKNupjv/0oU6SNncQBjgQxH3HR1O1RY1TRZQMoburnCHo8czX rHk//7/3O8sWptObcq1zR1vx290WghcsSjAskbh4vPFWbxey7jyFIlbabbXo8VDuw/Ir eTfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=GHdE9k1a; 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 g15-20020a056a000b8f00b00682a918af03si12209621pfj.266.2023.07.25.06.32.16; Tue, 25 Jul 2023 06:32:30 -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=GHdE9k1a; 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 S233343AbjGYMuf (ORCPT + 99 others); Tue, 25 Jul 2023 08:50:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232487AbjGYMuB (ORCPT ); Tue, 25 Jul 2023 08:50:01 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4197FB for ; Tue, 25 Jul 2023 05:50:00 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-992acf67388so808358166b.1 for ; Tue, 25 Jul 2023 05:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1690289399; x=1690894199; 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=hYD19a3O4cLr2nNRYtCL9dvjJwOe0PKsrRBMJLYvYmk=; b=GHdE9k1axkZh7NG9FIG7kI8HeFho5+otFcadAxyAUdOWSW7V/XOJ21z5Ifyub4COEC q8laY+zuCtm2eyIecUUCxyBTZE7qfOTVx9oxSEBy/oyDXQiTxtbhRWuGU8oBn6eshgyR A8dG9P0c0KnZVm3X7oE4zOsYB/aZWL6OBhVRzw+6xjNq4csxLPXaQQZShnEDhnJ+B8JU PXQmR6+21kJN2svkUZo0fpfsnIfgJF5VlP+B+n2L0wCT6KitWDDhEeOly03GYkqbgA+Y Rf0plGS60rcTO2CY44aLHydcAEQgamP+SWgUm4R1a2H0QdCZTmGa9IIUSv6tV5wV6njv WCBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690289399; x=1690894199; 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=hYD19a3O4cLr2nNRYtCL9dvjJwOe0PKsrRBMJLYvYmk=; b=VEn+t9IiXJ4i/DLNTmWPrYLv6J0lZtxLucZRB1VIkl5qTs5M6yZi4e7ynNiHgk+dSF el/XZOejWoPEGyS8sj6CbfMgDEUiPjS/XPkPwq3Zo1oC3qeuxnayqmzjeDdsCCnGgA29 mhYXJui9IPvTSXS2i0YcZYWWEgQO4u+SQYHxVGB/zO5c4CTcRBGRQ7HVi/3iPxH4I1St z90B3dU3Ktr1AQMsXnWaANIHiV9kPj25ZNLf+a1LZbXR/S2XJ0TAdBzWqmqGStLWVRJk a6J5+j1sLtpbd7FtWcczKa0utrXIdeSkijUYRfq2kkFUXrcWbsyHdhEhayZGm1+u3cs8 5qtQ== X-Gm-Message-State: ABy/qLZPcwwE5xek5Asu6cYOHxcjicXT/sxWTuSDiweKpn4X0q4wDkX+ qKAIxQgMfiVj96sAtsKcVsl8mw== X-Received: by 2002:a17:907:7819:b0:99b:4790:a4d4 with SMTP id la25-20020a170907781900b0099b4790a4d4mr12653941ejc.38.1690289399222; Tue, 25 Jul 2023 05:49:59 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 05:49:58 -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 3/3] pmbus_core: Fix Deadlock Date: Tue, 25 Jul 2023 14:49:52 +0200 Message-ID: <20230725124954.3824954-3-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: 1772399572754844116 X-GMAIL-MSGID: 1772399572754844116 From: Patrick Rudolph pmbus_regulator_get_error_flags() will also acquire the update_lock, thus unlock the mutex before trying to lock it again from within the same thread. Fixes a deadlock when trying to read the regulator status. Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki --- drivers/hwmon/pmbus/pmbus_core.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 1f7df36c48a8..1151a09243d3 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -2946,37 +2946,27 @@ static int pmbus_regulator_get_status(struct regulator_dev *rdev) mutex_lock(&data->update_lock); status = pmbus_get_status(client, page, PMBUS_STATUS_WORD); - if (status < 0) { - ret = status; - goto unlock; - } + mutex_unlock(&data->update_lock); + if (status < 0) + return status; - if (status & PB_STATUS_OFF) { - ret = REGULATOR_STATUS_OFF; - goto unlock; - } + if (status & PB_STATUS_OFF) + return REGULATOR_STATUS_OFF; /* If regulator is ON & reports power good then return ON */ - if (!(status & PB_STATUS_POWER_GOOD_N)) { - ret = REGULATOR_STATUS_ON; - goto unlock; - } + if (!(status & PB_STATUS_POWER_GOOD_N)) + return REGULATOR_STATUS_ON; ret = pmbus_regulator_get_error_flags(rdev, &status); if (ret) - goto unlock; + return ret; if (status & (REGULATOR_ERROR_UNDER_VOLTAGE | REGULATOR_ERROR_OVER_CURRENT | REGULATOR_ERROR_REGULATION_OUT | REGULATOR_ERROR_FAIL | REGULATOR_ERROR_OVER_TEMP)) { - ret = REGULATOR_STATUS_ERROR; - goto unlock; + return REGULATOR_STATUS_ERROR; } - ret = REGULATOR_STATUS_UNDEFINED; - -unlock: - mutex_unlock(&data->update_lock); - return ret; + return REGULATOR_STATUS_UNDEFINED; } static int pmbus_regulator_get_low_margin(struct i2c_client *client, int page)