From: Yu-cheng Yu <yu-cheng.yu@intel.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org,
"H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H.J. Lu" <hjl.tools@gmail.com>
Cc: Yu-cheng Yu <yu-cheng.yu@intel.com>
Subject: [PATCH] binfmt_elf: Fix core dump memory corruption
Date: Tue, 17 Jul 2018 09:25:02 -0700 [thread overview]
Message-ID: <20180717162502.32274-1-yu-cheng.yu@intel.com> (raw)
In fill_note_info(), we kzalloc elf_thread_core_info.notes[] only
for (core_note_type != 0) regsets. However, in
fill_thread_core_info(), we still leave empty notes and go beyond
the allocated size. Fix it.
Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com>
---
fs/binfmt_elf.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 816cc921cf36..6f42e05d2833 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1723,7 +1723,8 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,
const struct user_regset_view *view,
long signr, size_t *total)
{
- unsigned int i;
+ unsigned int i; /* index to regsets */
+ unsigned int j; /* index to notes */
unsigned int regset0_size = regset_size(t->task, &view->regsets[0]);
/*
@@ -1744,9 +1745,9 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,
/*
* Each other regset might generate a note too. For each regset
- * that has no core_note_type or is inactive, we leave t->notes[i]
- * all zero and we'll know to skip writing it later.
+ * that has no core_note_type or is inactive, we skip it.
*/
+ j = 1;
for (i = 1; i < view->n; ++i) {
const struct user_regset *regset = &view->regsets[i];
do_thread_regset_writeback(t->task, regset);
@@ -1763,17 +1764,18 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,
kfree(data);
else {
if (regset->core_note_type != NT_PRFPREG)
- fill_note(&t->notes[i], "LINUX",
+ fill_note(&t->notes[j], "LINUX",
regset->core_note_type,
size, data);
else {
SET_PR_FPVALID(&t->prstatus,
1, regset0_size);
- fill_note(&t->notes[i], "CORE",
+ fill_note(&t->notes[j], "CORE",
NT_PRFPREG, size, data);
}
- *total += notesize(&t->notes[i]);
+ *total += notesize(&t->notes[j]);
}
+ j++;
}
}
--
2.17.1
next reply other threads:[~2018-07-17 16:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-17 16:25 Yu-cheng Yu [this message]
2018-09-25 17:39 ` [PATCH] binfmt_elf: Fix core dump memory corruption Yu-cheng Yu
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=20180717162502.32274-1-yu-cheng.yu@intel.com \
--to=yu-cheng.yu@intel.com \
--cc=hjl.tools@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@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;
as well as URLs for NNTP newsgroup(s).