From: Borislav Petkov <bp@alien8.de>
To: Xiongfeng Wang <wangxiongfeng2@huawei.com>
Cc: mchehab@kernel.org, tony.luck@intel.com,
linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] EDAC/mc_sysfs: Add missing newlines when printing {max,dimm}_location
Date: Wed, 16 Sep 2020 19:00:52 +0200 [thread overview]
Message-ID: <20200916170052.GO2643@zn.tnic> (raw)
In-Reply-To: <1600051734-8993-1-git-send-email-wangxiongfeng2@huawei.com>
On Mon, Sep 14, 2020 at 10:48:54AM +0800, Xiongfeng Wang wrote:
> @@ -813,15 +817,21 @@ static ssize_t mci_max_location_show(struct device *dev,
> char *data)
> {
> struct mem_ctl_info *mci = to_mci(dev);
> - int i;
> + int i, n;
> char *p = data;
> + unsigned int len = PAGE_SIZE;
>
> for (i = 0; i < mci->n_layers; i++) {
> - p += sprintf(p, "%s %d ",
> + n = snprintf(p, len, "%s %d ",
> edac_layer_name[mci->layers[i].type],
> mci->layers[i].size - 1);
> + p += n;
> + len -= n;
What happens if that subtraction causes len to wrap around and become a
huge positive unsigned integer?
> + if (!len)
Would that test still work?
IOW, I did this to your patch ontop. Note that I've moved the "p"
pointer incrementation after the length check so that the pointer
doesn't overflow too:
---
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index bf0e075fb635..fa0551c81e63 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -817,19 +817,22 @@ static ssize_t mci_max_location_show(struct device *dev,
char *data)
{
struct mem_ctl_info *mci = to_mci(dev);
- int i, n;
+ int len = PAGE_SIZE;
char *p = data;
- unsigned int len = PAGE_SIZE;
+ int i, n;
for (i = 0; i < mci->n_layers; i++) {
n = snprintf(p, len, "%s %d ",
edac_layer_name[mci->layers[i].type],
mci->layers[i].size - 1);
- p += n;
+
len -= n;
- if (!len)
+ if (len < 0)
goto out;
+
+ p += n;
}
+
p += snprintf(p, len, "\n");
out:
return p - data;
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
next prev parent reply other threads:[~2020-09-16 17:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 2:48 [PATCH v2] EDAC/mc_sysfs: Add missing newlines when printing {max,dimm}_location Xiongfeng Wang
2020-09-16 17:00 ` Borislav Petkov [this message]
2020-09-17 11:38 ` Xiongfeng Wang
2020-09-17 15:28 ` Joe Perches
2020-09-17 16:25 ` Borislav Petkov
2020-09-18 2:37 ` Xiongfeng Wang
2020-09-18 7:12 ` Borislav Petkov
2020-09-18 13:31 ` Joe Perches
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=20200916170052.GO2643@zn.tnic \
--to=bp@alien8.de \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=tony.luck@intel.com \
--cc=wangxiongfeng2@huawei.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