From: Chen Gang <gang.chen.5i5j@gmail.com>
To: Michael Tokarev <mjt@tls.msk.ru>, Alexander Graf <agraf@suse.de>,
pbonzini@redhat.com
Cc: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org,
qemu-devel <qemu-devel@nongnu.org>,
kvm@vger.kernel.org
Subject: Re: [Qemu-devel] [Qemu-trivial] [PATCH] target-ppc: kvm: Fix memory overflow issue about strncat()
Date: Fri, 24 Oct 2014 16:19:43 +0800 [thread overview]
Message-ID: <544A0B9F.9040500@gmail.com> (raw)
In-Reply-To: <544A046D.4090204@msgid.tls.msk.ru>
On 10/24/14 15:49, Michael Tokarev wrote:
> On 10/13/2014 06:47 PM, Alexander Graf wrote:
>> On 13.10.14 16:36, Chen Gang wrote:
>>> strncat() will append additional '\0' to destination buffer, so need
>>> additional 1 byte for it, or may cause memory overflow, just like other
>>> area within QEMU have done.
>>>
>>> Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
>>
>> I agree with this patch. However, the code is pretty ugly - I'm sure it
>> must've been me who wrote it :).
>>
>> Could you please instead rewrite it to use g_strdup_printf() rather than
>> strncat()s? That way we resolve all string pitfalls automatically - and
>> this code is not the fast path, so doing an extra memory allocation is ok.
>
> I'd just use snprintf() like this:
>
> diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
> index 9c23c6b..5eaa36c 100644
> --- a/target-ppc/kvm.c
> +++ b/target-ppc/kvm.c
> @@ -1794,8 +1794,7 @@ static uint64_t kvmppc_read_int_cpu_dt(const char *propname)
> return -1;
> }
>
> - strncat(buf, "/", sizeof(buf) - strlen(buf));
> - strncat(buf, propname, sizeof(buf) - strlen(buf));
> + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "/%s", propname);
>
> f = fopen(buf, "rb");
> if (!f) {
>
> the buffer is of size PATH_MAX, and we're looking at /proc filesystem where
> names should be rather short so we're extremly unlikely to hit this prob in
> practice, there's no need to dynamically allocate a buffer for this stuff.
>
> (Or alternatively there's asprintf(), but still I think it is overkill).
>
> I can apply the above if everyone agrees.
>
For me, what you said is reasonable, although I am not sure whether the
patch v2 for g_strdup_printf() was already applied or not.
Thanks.
--
Chen Gang
Open, share, and attitude like air, water, and life which God blessed
prev parent reply other threads:[~2014-10-24 8:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-13 14:36 [Qemu-devel] [PATCH] target-ppc: kvm: Fix memory overflow issue about strncat() Chen Gang
2014-10-13 14:47 ` Alexander Graf
2014-10-13 15:43 ` Chen Gang
2014-10-24 7:49 ` [Qemu-devel] [Qemu-trivial] " Michael Tokarev
2014-10-24 8:05 ` Alexander Graf
2014-10-24 8:19 ` Chen Gang [this message]
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=544A0B9F.9040500@gmail.com \
--to=gang.chen.5i5j@gmail.com \
--cc=agraf@suse.de \
--cc=kvm@vger.kernel.org \
--cc=mjt@tls.msk.ru \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-trivial@nongnu.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).