diff options
author | Andy Walker <andy@puszczka.com> | 2006-09-18 10:11:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-09-18 10:11:36 -0400 |
commit | b9c54f91a48146778fe91423d4d467a0ee8c719b (patch) | |
tree | f123be6ee2fb44b5795a3aa6f0ccbc8e9ea19d2b /arch/sparc64/kernel/sys_sparc.c | |
parent | b9b64e6e89fc5a6ef220747115c5b7764614ca3f (diff) |
[SPARC]: Fix regression in sys_getdomainname()
This patch corrects the buffer length checking in the
sys_getdomainname() implementation for sparc/sparc64.
Signed-off-by: Andy Walker <andy@puszczka.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/sys_sparc.c')
-rw-r--r-- | arch/sparc64/kernel/sys_sparc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c index bf5f14ee73de..c608c947e6c3 100644 --- a/arch/sparc64/kernel/sys_sparc.c +++ b/arch/sparc64/kernel/sys_sparc.c | |||
@@ -707,19 +707,21 @@ asmlinkage long sys_getdomainname(char __user *name, int len) | |||
707 | { | 707 | { |
708 | int nlen, err; | 708 | int nlen, err; |
709 | 709 | ||
710 | if (len < 0 || len > __NEW_UTS_LEN) | 710 | if (len < 0) |
711 | return -EINVAL; | 711 | return -EINVAL; |
712 | 712 | ||
713 | down_read(&uts_sem); | 713 | down_read(&uts_sem); |
714 | 714 | ||
715 | nlen = strlen(system_utsname.domainname) + 1; | 715 | nlen = strlen(system_utsname.domainname) + 1; |
716 | if (nlen < len) | 716 | err = -EINVAL; |
717 | len = nlen; | 717 | if (nlen > len) |
718 | goto out; | ||
718 | 719 | ||
719 | err = -EFAULT; | 720 | err = -EFAULT; |
720 | if (!copy_to_user(name, system_utsname.domainname, len)) | 721 | if (!copy_to_user(name, system_utsname.domainname, nlen)) |
721 | err = 0; | 722 | err = 0; |
722 | 723 | ||
724 | out: | ||
723 | up_read(&uts_sem); | 725 | up_read(&uts_sem); |
724 | return err; | 726 | return err; |
725 | } | 727 | } |