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 2ACA81DDCE; Tue, 16 Jul 2024 15:57:17 +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=1721145437; cv=none; b=Mu77Pd0cpqtg7xRZu4nWZXs43P8bwCsOA6nq9OiwsNiyX6iDpfoLs0Xbgld5GWA5z1Db7//oW7Y0WZILhXkLb5bwvgcb4pOcyUH2jUzu0E9YJpliZDBUo+aEFYGEZnLDzQyPz5sNL/w/oObDMuFgxo9AQtJoFlBJjZ3Cviqoj3I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721145437; c=relaxed/simple; bh=I8ZddaLuFrwn4k4KH5kXtwSv+egeaguPYZnDqdKfgAU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aXZbWHPCW5X4FMMZgvLGf2wcC1Khzg11+czlZO0d5DjATeOlSA+R4CHg/dwYPdo83KBgj6IvVWY+BSnqu5rXDwWAoByYOrexOxI794Z0D0P3VaIT1cad6fD2py1fXXu/B4dJFScwVSkOGcxQMkajYt8lGidEUvV11nzQTdPBPlI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=W8v2/BEQ; 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="W8v2/BEQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A778FC116B1; Tue, 16 Jul 2024 15:57:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721145437; bh=I8ZddaLuFrwn4k4KH5kXtwSv+egeaguPYZnDqdKfgAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W8v2/BEQO2Z/BTC//kD2D6oMOquogEgEthWK+qLqLIHGYl5sHjrmVHsA8q8pI9bsN hoytzopSQmbUWnolcQHer1kCM4ipnc1NAo8qBfSYTNRhIOYfM0n0lawF5eEQUFOMiB p22eKBto62jH7AEixshOfLTuUXsyjIaB3Zk1aUAA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Joy Chakraborty , Dan Carpenter , Srinivas Kandagatla Subject: [PATCH 6.1 63/96] nvmem: rmem: Fix return value of rmem_read() Date: Tue, 16 Jul 2024 17:32:14 +0200 Message-ID: <20240716152748.931071408@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240716152746.516194097@linuxfoundation.org> References: <20240716152746.516194097@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Joy Chakraborty commit 28b008751aa295612318a0fbb2f22dd4f6a83139 upstream. reg_read() callback registered with nvmem core expects 0 on success and a negative value on error but rmem_read() returns the number of bytes read which is treated as an error at the nvmem core. This does not break when rmem is accessed using sysfs via bin_attr_nvmem_read()/write() but causes an error when accessed from places like nvmem_access_with_keepouts(), etc. Change to return 0 on success and error in case memory_read_from_buffer() returns an error or -EIO if bytes read do not match what was requested. Fixes: 5a3fa75a4d9c ("nvmem: Add driver to expose reserved memory as nvmem") Cc: stable@vger.kernel.org Signed-off-by: Joy Chakraborty Reviewed-by: Dan Carpenter Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20240628113704.13742-2-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/nvmem/rmem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/nvmem/rmem.c +++ b/drivers/nvmem/rmem.c @@ -46,7 +46,10 @@ static int rmem_read(void *context, unsi memunmap(addr); - return count; + if (count < 0) + return count; + + return count == bytes ? 0 : -EIO; } static int rmem_probe(struct platform_device *pdev)