| Message ID | 543E7B17.1050902@gmail.com |
|---|---|
| State | New |
| Headers | show |
On 15.10.14 15:48, 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. > > And can use g_strdup_printf() instead of strncat(), which may be more > easier understanding. > > Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> Thanks, applied to ppc-next. And sorry for not replying earlier. Alex
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 66e7ce5..cea6a87 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -1782,7 +1782,7 @@ static int kvmppc_find_cpu_dt(char *buf, int buf_len) * format) */ static uint64_t kvmppc_read_int_cpu_dt(const char *propname) { - char buf[PATH_MAX]; + char buf[PATH_MAX], *tmp; union { uint32_t v32; uint64_t v64; @@ -1794,10 +1794,10 @@ 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)); + tmp = g_strdup_printf("%s/%s", buf, propname); - f = fopen(buf, "rb"); + f = fopen(tmp, "rb"); + g_free(tmp); if (!f) { return -1; }
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. And can use g_strdup_printf() instead of strncat(), which may be more easier understanding. Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> --- target-ppc/kvm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)