mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-29 23:03:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

linux-user: Don't write off end of new_utsname buffer

Browse Source 
Use g_strlcpy() rather than strcpy() to copy the uname string
into the structure we return to the guest for the uname syscall.
This avoids overrunning the buffer if the user passed us an
overlong string via the QEMU command line.

We fix a comment typo while we're in the neighbourhood.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2016-07-12 13:02:16 +01:00 committed by Riku Voipio
parent ba4b3f668a
commit 332c9781f6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linux-user/syscall.c
View File

@ -9237,12 +9237,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
goto efault; goto efault;
ret = get_errno(sys_uname(buf)); ret = get_errno(sys_uname(buf));
if (!is_error(ret)) { if (!is_error(ret)) {
/* Overrite the native machine name with whatever is being /* Overwrite the native machine name with whatever is being
emulated. */ emulated. */
strcpy (buf->machine, cpu_to_uname_machine(cpu_env)); strcpy (buf->machine, cpu_to_uname_machine(cpu_env));
/* Allow the user to override the reported release. */ /* Allow the user to override the reported release. */
if (qemu_uname_release && *qemu_uname_release) if (qemu_uname_release && *qemu_uname_release) {
strcpy (buf->release, qemu_uname_release); g_strlcpy(buf->release, qemu_uname_release,
sizeof(buf->release));
}
} }
unlock_user_struct(buf, arg1, 1); unlock_user_struct(buf, arg1, 1);
} }