From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: ian.jackson@eu.citrix.com, stefano.stabellini@eu.citrix.com,
ian.campbell@citrix.com, wei.liu2@citrix.com
Cc: jgross@suse.com, andrew.cooper3@citrix.com,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
roger.pau@citrix.com, xen-devel@lists.xen.org
Subject: [PATCH v3 1/2] libxc: Don't write terminating NULL character to command string
Date: Wed, 6 Jan 2016 15:03:21 -0500 [thread overview]
Message-ID: <1452110602-3570-2-git-send-email-boris.ostrovsky@oracle.com> (raw)
In-Reply-To: <1452110602-3570-1-git-send-email-boris.ostrovsky@oracle.com>
When copying boot command string for HVMlite guests we explicitly write
'\0' at MAX_GUEST_CMDLINE offset. Unless the string is close to
MAX_GUEST_CMDLINE in length this write will end up in the wrong place,
beyond the end of the mapped range.
We don't need to limit the size of command string to some arbitrary
number. Any size that can be successfully allocated and mapped is valid
and so the string is guaranteed to be NULL-terminated (since we use
strlen, which needs terminating '\0', to calculate allocation size).
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
tools/libxc/xc_dom_x86.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c
index 3960875..b8d2904 100644
--- a/tools/libxc/xc_dom_x86.c
+++ b/tools/libxc/xc_dom_x86.c
@@ -676,8 +676,7 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom)
if ( dom->cmdline )
{
- strncpy(cmdline, dom->cmdline, MAX_GUEST_CMDLINE);
- cmdline[MAX_GUEST_CMDLINE - 1] = '\0';
+ strncpy(cmdline, dom->cmdline, cmdline_size);
start_info->cmdline_paddr = (seg.pfn << PAGE_SHIFT) +
((uintptr_t)cmdline - (uintptr_t)start_info);
}
--
1.7.1
next prev parent reply other threads:[~2016-01-06 20:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-06 20:03 [PATCH v3 0/2] HVMlite start_info initialization fixes Boris Ostrovsky
2016-01-06 20:03 ` Boris Ostrovsky [this message]
2016-01-07 11:19 ` [PATCH v3 1/2] libxc: Don't write terminating NULL character to command string Wei Liu
2016-01-07 13:24 ` Ian Campbell
2016-01-06 20:03 ` [PATCH v3 2/2] libxc: Defer initialization of start_page for HVM guests Boris Ostrovsky
2016-01-07 11:43 ` Roger Pau Monné
2016-01-07 14:47 ` Boris Ostrovsky
2016-01-07 16:54 ` Roger Pau Monné
2016-01-07 17:06 ` Ian Campbell
2016-01-07 17:33 ` Boris Ostrovsky
2016-01-07 17:38 ` Ian Campbell
2016-01-07 11:45 ` Roger Pau Monné
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=1452110602-3570-2-git-send-email-boris.ostrovsky@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jgross@suse.com \
--cc=roger.pau@citrix.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.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).