Buffer overrun in arch/x86_64/sys_ia32.c:sys32_ni_syscall()
struct task_struct.comm is defined to be 16 chars, but arch/x86_64/sys_ia32.c:sys32_ni_syscall() copies it into a static 8 byte buffer, which will surely cause problems. This patch makes lastcomm[] the right size, and makes sure it can't be overrun. Since the code also goes to the effort of getting a local copy of current in "me", we may as well use it for printing the message.
Patch is against 2.6.10-rc2-mm3.
J
arch/x86_64/ia32/sys_ia32.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
arch/x86_64/ia32/sys_ia32.c renamed from arch/x86_64/ia32/sys_ia32.c~short-comm-string +6 -5
@@ -525,11 +525,12 @@ sys32_waitpid(compat_pid_t pid, unsignedint sys32_ni_syscall (int call) {struct task_struct *me = current; -static char lastcomm[8 ]; -if (strcmp (lastcomm, me->comm)) { -printk (KERN_INFO "IA32 syscall %d from %s not implemented\n" , call, - current->comm); -strcpy (lastcomm, me->comm); +static char lastcomm[sizeof (me->comm)]; + +if (strncmp (lastcomm, me->comm,sizeof (lastcomm))) { +printk (KERN_INFO "IA32 syscall %d from %s not implemented\n" , call, + me->comm); +strncpy (lastcomm, me->comm,sizeof (lastcomm)); }return -ENOSYS ; }
_
Quoted 6 lines · * Jeremy Fitzhardinge ([email protected]) wrote:
struct task_struct.comm is defined to be 16 chars, but arch/x86_64/sys_ia32.c:sys32_ni_syscall() copies it into a static 8 byte buffer, which will surely cause problems. This patch makes lastcomm[] the right size, and makes sure it can't be overrun. Since the code also goes to the effort of getting a local copy of current in "me", we may as well use it for printing the message.
Looks good, but you missed sys32_vm86_warning.
===== arch/x86_64/ia32/sys_ia32.c 1.74 vs edited =====
arch/x86_64/ia32/sys_ia32.c +9 -8
@@ -525,11 +525,12 @@ sys32_waitpid(compat_pid_t pid, unsignedint sys32_ni_syscall (int call) {struct task_struct *me = current; -static char lastcomm[8 ]; -if (strcmp (lastcomm, me->comm)) { -printk (KERN_INFO "IA32 syscall %d from %s not implemented\n" , call, - current->comm); -strcpy (lastcomm, me->comm); +static char lastcomm[sizeof (me->comm)]; + +if (strncmp (lastcomm, me->comm,sizeof (lastcomm))) { +printk (KERN_INFO "IA32 syscall %d from %s not implemented\n" , + call, me->comm); +strncpy (lastcomm, me->comm,sizeof (lastcomm)); }return -ENOSYS ; }
@@ -1125,11 +1126,11 @@ long sys32_fadvise64_64(int fd, __u32 oflong sys32_vm86_warning (void ) {struct task_struct *me = current; -static char lastcomm[8 ]; -if (strcmp (lastcomm, me->comm)) { +static char lastcomm[sizeof (me->comm)]; +if (strncmp (lastcomm, me->comm,sizeof (lastcomm))) {printk (KERN_INFO "%s: vm86 mode not supported on 64 bit kernel\n" , me->comm); -strcpy (lastcomm, me->comm); +strncpy (lastcomm, me->comm,sizeof (lastcomm)); }return -ENOSYS ; }
Quoted 9 lines · Chris Wright
Quoted 6 lines · * Jeremy Fitzhardinge ([email protected]) wrote:
struct task_struct.comm is defined to be 16 chars, but arch/x86_64/sys_ia32.c:sys32_ni_syscall() copies it into a static 8 byte buffer, which will surely cause problems. This patch makes lastcomm[] the right size, and makes sure it can't be overrun. Since the code also goes to the effort of getting a local copy of current in "me", we may as well use it for printing the message.
Looks good, but you missed
sys32_vm86_warning.
Hadn't got that far. Should we be worried that task_struct.comm might not be \0-terminated, and therefore use ("... %.*s ...", sizeof(lastcomm), lastcomm) in the printk's?
J
Quoted 9 lines · * Jeremy Fitzhardinge ([email protected]) wrote:
Quoted 8 lines · Chris Wright
Quoted 6 lines · * Jeremy Fitzhardinge ([email protected]) wrote:
struct task_struct.comm is defined to be 16 chars, but arch/x86_64/sys_ia32.c:sys32_ni_syscall() copies it into a static 8 byte buffer, which will surely cause problems. This patch makes lastcomm[] the right size, and makes sure it can't be overrun. Since the code also goes to the effort of getting a local copy of current in "me", we may as well use it for printing the message.
Quoted 5 lines
Quoted 1 line
Looks good, but you missed
sys32_vm86_warning.Hadn't got that far. Should we be worried that task_struct.comm might not be \0-terminated, and therefore use ("... %.*s ...", sizeof(lastcomm), lastcomm) in the printk's?
It gets NULL terminated during exec or prctl.
thanks,
-chris
Signature · 1 line
Linux Security Modules http://lsm.immunix.org http://lsm.bkbits.net