From: Ma Ke <make24@iscas.ac.cn>
To: dinguyen@kernel.org, bp@alien8.de, tony.luck@intel.com,
james.morse@arm.com, mchehab@kernel.org, rric@kernel.org,
niravkumar.l.rabara@intel.com
Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org,
Ma Ke <make24@iscas.ac.cn>,
stable@vger.kernel.org
Subject: [PATCH RESEND] EDAC/altera: Fix possible null pointer dereference
Date: Wed, 24 Jul 2024 15:05:29 +0800 [thread overview]
Message-ID: <20240724070529.1493072-1-make24@iscas.ac.cn> (raw)
In altr_s10_sdram_check_ecc_deps(), of_get_address() may return NULL which
is later dereferenced. Fix this bug by adding NULL check.
Cc: stable@vger.kernel.org
Fixes: e1bca853dddc ("EDAC/altera: Add SDRAM ECC check for U-Boot")
Signed-off-by: Ma Ke <make24@iscas.ac.cn>
---
drivers/edac/altera_edac.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
index fe89f5c4837f..d6bf0eebeb41 100644
--- a/drivers/edac/altera_edac.c
+++ b/drivers/edac/altera_edac.c
@@ -1086,6 +1086,7 @@ static int altr_s10_sdram_check_ecc_deps(struct altr_edac_device_dev *device)
struct arm_smccc_res result;
struct device_node *np;
phys_addr_t sdram_addr;
+ const __be32 *sdram_addrp;
u32 read_reg;
int ret;
@@ -1093,8 +1094,14 @@ static int altr_s10_sdram_check_ecc_deps(struct altr_edac_device_dev *device)
if (!np)
goto sdram_err;
- sdram_addr = of_translate_address(np, of_get_address(np, 0,
- NULL, NULL));
+ sdram_addrp = of_get_address(np, 0, NULL, NULL);
+ if (!sdram_addrp)
+ return -EINVAL;
+
+ sdram_addr = of_translate_address(np, sdram_addrp);
+ if (!sdram_addr)
+ return -EINVAL;
+
of_node_put(np);
sdram_ecc_addr = (unsigned long)sdram_addr + prv->ecc_en_ofst;
arm_smccc_smc(INTEL_SIP_SMC_REG_READ, sdram_ecc_addr,
--
2.25.1
next reply other threads:[~2024-07-24 7:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-24 7:05 Ma Ke [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-02 3:38 Ma Ke
2024-08-02 6:01 ` Naik, Avadhut
2024-07-18 13:29 Ma Ke
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=20240724070529.1493072-1-make24@iscas.ac.cn \
--to=make24@iscas.ac.cn \
--cc=bp@alien8.de \
--cc=dinguyen@kernel.org \
--cc=james.morse@arm.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=niravkumar.l.rabara@intel.com \
--cc=rric@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tony.luck@intel.com \
/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
all inboxes | Powered by JetHome®