lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SPARC]: Fix length parameter verification in sys_getdomainname().

Browse Source 
Found by scrashme.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2006-07-21 14:12:39 -07:00
parent 8a84eb164c
commit 8310a32c15
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/sparc/kernel/sys_sparc.c
View File

@@ -465,21 +465,21 @@ sys_rt_sigaction(int sig,
asmlinkage int sys_getdomainname(char __user *name, int len) asmlinkage int sys_getdomainname(char __user *name, int len)
{ {
int nlen; int nlen, err;
int err = -EFAULT;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
down_read(&uts_sem); down_read(&uts_sem);
nlen = strlen(system_utsname.domainname) + 1; nlen = strlen(system_utsname.domainname) + 1;
if (nlen < len) if (nlen < len)
len = nlen; len = nlen;
if (len > __NEW_UTS_LEN)
goto done; err = -EFAULT;
if (copy_to_user(name, system_utsname.domainname, len)) if (!copy_to_user(name, system_utsname.domainname, len))
goto done;
err = 0; err = 0;
done:
up_read(&uts_sem); up_read(&uts_sem);
return err; return err;
} }

16
arch/sparc64/kernel/sys_sparc.c
View File

@@ -701,21 +701,21 @@ extern void check_pending(int signum);
asmlinkage long sys_getdomainname(char __user *name, int len) asmlinkage long sys_getdomainname(char __user *name, int len)
{ {
int nlen; int nlen, err;
int err = -EFAULT;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
down_read(&uts_sem); down_read(&uts_sem);
nlen = strlen(system_utsname.domainname) + 1; nlen = strlen(system_utsname.domainname) + 1;
if (nlen < len) if (nlen < len)
len = nlen; len = nlen;
if (len > __NEW_UTS_LEN)
goto done; err = -EFAULT;
if (copy_to_user(name, system_utsname.domainname, len)) if (!copy_to_user(name, system_utsname.domainname, len))
goto done;
err = 0; err = 0;
done:
up_read(&uts_sem); up_read(&uts_sem);
return err; return err;
} }