From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6962A4315A; Mon, 23 Jun 2025 21:42:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750714958; cv=none; b=k66xJhoZPq9wBibRo5VRltH4bMO0Iqa3Gj5J5NKTnpV6y/kM7p0SRnPLeegA+cQbLsZy0X/cumlynrmKbbfj85nk8242HH02IEIzF5Dal/K7rt6uYRwOrEEQ53E7xgWru7Mp3u8yH/cPbD6RklFzjS7JUcgGHKr2M9l+8zOg7js= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750714958; c=relaxed/simple; bh=bcIjHemZn4dS0uum3Dz94L0aGBQoO+Mb81a2ZtMWYf4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RkD03QeAsRJLlR1IXlm7hT3pCr/BsNkyAuEyJbivcTIMlUHAabv8o9jtMkfneORLLPcnioHDUj1iXEa5h1E6F+kWzQb4XuPt+NI2ymg/msiQgyTt43uh1x3YBpURdlAR5pbC8DWPRrAQafdlstaKRFfFzrXo+fmIFS0IcNugkQE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eYpVoALe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="eYpVoALe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0334EC4CEEA; Mon, 23 Jun 2025 21:42:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750714958; bh=bcIjHemZn4dS0uum3Dz94L0aGBQoO+Mb81a2ZtMWYf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eYpVoALe7sqbu9UgFf3jCwYHySrVALUIqFN+36DoSAq7eZ44OpfTfVMGLpGHBgveA RzVcHpJ9980ZmE2J72EnJzc1kStF+QOIcNsywt4X3kY/P4E9bPPqSdTd6eavmcVmLU pyM0Vwdn/AJh/eKQeZun4/DLph2CfGB+1HiCSVxg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wentao Liang , Mark Brown Subject: [PATCH 6.12 139/414] regulator: max14577: Add error check for max14577_read_reg() Date: Mon, 23 Jun 2025 15:04:36 +0200 Message-ID: <20250623130645.530554572@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130642.015559452@linuxfoundation.org> References: <20250623130642.015559452@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wentao Liang commit 65271f868cb1dca709ff69e45939bbef8d6d0b70 upstream. The function max14577_reg_get_current_limit() calls the function max14577_read_reg(), but does not check its return value. A proper implementation can be found in max14577_get_online(). Add a error check for the max14577_read_reg() and return error code if the function fails. Fixes: b0902bbeb768 ("regulator: max14577: Add regulator driver for Maxim 14577") Cc: stable@vger.kernel.org # v3.14 Signed-off-by: Wentao Liang Link: https://patch.msgid.link/20250526025627.407-1-vulab@iscas.ac.cn Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/regulator/max14577-regulator.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/regulator/max14577-regulator.c +++ b/drivers/regulator/max14577-regulator.c @@ -40,11 +40,14 @@ static int max14577_reg_get_current_limi struct max14577 *max14577 = rdev_get_drvdata(rdev); const struct maxim_charger_current *limits = &maxim_charger_currents[max14577->dev_type]; + int ret; if (rdev_get_id(rdev) != MAX14577_CHARGER) return -EINVAL; - max14577_read_reg(rmap, MAX14577_CHG_REG_CHG_CTRL4, ®_data); + ret = max14577_read_reg(rmap, MAX14577_CHG_REG_CHG_CTRL4, ®_data); + if (ret < 0) + return ret; if ((reg_data & CHGCTRL4_MBCICHWRCL_MASK) == 0) return limits->min;