From: "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
To: linux-arm-msm@vger.kernel.org
Cc: "Bjorn Andersson" <bjorn.andersson@linaro.org>,
linux-soc@vger.kernel.org, "Andy Gross" <andy.gross@linaro.org>,
"David Brown" <david.brown@linaro.org>,
linux-kernel@vger.kernel.org,
"Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
Subject: [PATCH 2/2] soc: qcom: smsm: Avoid the use of an uninitialized value
Date: Wed, 15 Mar 2017 12:43:57 +0100 [thread overview]
Message-ID: <20170315114357.14446-2-j.neuschaefer@gmx.net> (raw)
In-Reply-To: <20170315114357.14446-1-j.neuschaefer@gmx.net>
If qcom_smem_get returns an error besides -EPROBE_DEFER or -ENOENT,
don't assume that size has been set.
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
drivers/soc/qcom/smsm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c
index 3918645e5708..632c060c9cc0 100644
--- a/drivers/soc/qcom/smsm.c
+++ b/drivers/soc/qcom/smsm.c
@@ -441,7 +441,8 @@ static int smsm_get_size_info(struct qcom_smsm *smsm)
info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_SIZE_INFO, &size);
if (PTR_ERR(info) == -EPROBE_DEFER) {
return PTR_ERR(info);
- } else if (PTR_ERR(info) == -ENOENT || size != sizeof(*info)) {
+ } else if (PTR_ERR(info) == -ENOENT ||
+ (!IS_ERR(info) && size != sizeof(*info))) {
dev_warn(smsm->dev, "no smsm size info, using defaults\n");
smsm->num_entries = SMSM_DEFAULT_NUM_ENTRIES;
smsm->num_hosts = SMSM_DEFAULT_NUM_HOSTS;
--
2.11.0
next prev parent reply other threads:[~2017-03-15 11:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-15 11:43 [PATCH 1/2] soc: qcom: smsm: Handle probe deferral Jonathan Neuschäfer
2017-03-15 11:43 ` Jonathan Neuschäfer [this message]
2017-03-17 14:01 ` Jonathan Neuschäfer
2017-03-28 6:18 ` Bjorn Andersson
2017-04-04 2:38 ` Jonathan Neuschäfer
2017-04-05 3:47 ` Bjorn Andersson
2017-04-05 12:10 ` [PATCH v2] soc: qcom: smsm: Improve error handling, quiesce " Jonathan Neuschäfer
2017-04-05 17:01 ` Bjorn Andersson
2017-05-31 14:00 ` Jonathan Neuschäfer
2017-06-01 6:34 ` Andy Gross
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=20170315114357.14446-2-j.neuschaefer@gmx.net \
--to=j.neuschaefer@gmx.net \
--cc=andy.gross@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=david.brown@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-soc@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
Powered by JetHome