From: Joy Chakraborty <joychakr@google.com>
To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rob Herring <robh@kernel.org>,
Nicolas Saenz Julienne <nsaenz@kernel.org>
Cc: linux-kernel@vger.kernel.org, manugautam@google.com,
Joy Chakraborty <joychakr@google.com>,
stable@vger.kernel.org
Subject: [PATCH v2] nvmem: rmem: Fix return value of rmem_read()
Date: Tue, 6 Feb 2024 04:24:08 +0000 [thread overview]
Message-ID: <20240206042408.224138-1-joychakr@google.com> (raw)
reg_read() callback registered with nvmem core expects an integer error
as a return value but rmem_read() returns the number of bytes read, as a
result error checks in nvmem core fail even when they shouldn't.
Return 0 on success where number of bytes read match the number of bytes
requested and a negative error -EINVAL on all other cases.
Fixes: 5a3fa75a4d9c ("nvmem: Add driver to expose reserved memory as nvmem")
Cc: stable@vger.kernel.org
Signed-off-by: Joy Chakraborty <joychakr@google.com>
---
drivers/nvmem/rmem.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/nvmem/rmem.c b/drivers/nvmem/rmem.c
index 752d0bf4445e..a74dfa279ff4 100644
--- a/drivers/nvmem/rmem.c
+++ b/drivers/nvmem/rmem.c
@@ -46,7 +46,12 @@ static int rmem_read(void *context, unsigned int offset,
memunmap(addr);
- return count;
+ if (count != bytes) {
+ dev_err(priv->dev, "Failed read memory (%d)\n", count);
+ return -EINVAL;
+ }
+
+ return 0;
}
static int rmem_probe(struct platform_device *pdev)
--
2.43.0.594.gd9cf4e227d-goog
next reply other threads:[~2024-02-06 4:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-06 4:24 Joy Chakraborty [this message]
2024-02-06 9:30 ` [PATCH v2] nvmem: rmem: Fix return value of rmem_read() Greg Kroah-Hartman
2024-02-06 10:31 ` Joy Chakraborty
2024-02-06 10:56 ` Greg Kroah-Hartman
2024-02-06 11:52 ` Joy Chakraborty
2024-02-07 9:34 ` Greg Kroah-Hartman
2024-02-07 15:03 ` Joy Chakraborty
2024-02-27 6:57 ` Joy Chakraborty
2024-02-27 7:32 ` Greg Kroah-Hartman
2024-02-27 8:31 ` Joy Chakraborty
2024-02-06 22:36 ` Srinivas Kandagatla
2024-02-07 6:35 ` Joy Chakraborty
2024-02-07 9:30 ` Srinivas Kandagatla
2024-02-07 14:46 ` Joy Chakraborty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240206042408.224138-1-joychakr@google.com \
--to=joychakr@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manugautam@google.com \
--cc=nsaenz@kernel.org \
--cc=robh@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox