Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9c54f91 authored by Andy Walker's avatar Andy Walker Committed by David S. Miller
Browse files

[SPARC]: Fix regression in sys_getdomainname() 



This patch corrects the buffer length checking in the
sys_getdomainname() implementation for sparc/sparc64.

Signed-off-by: default avatarAndy Walker <andy@puszczka.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b9b64e6e

arch/sparc/kernel/sys_sparc.c

+6 −4
Original line number Diff line number Diff line
@@ -470,19 +470,21 @@ asmlinkage int sys_getdomainname(char __user *name, int len) 
{

 	int nlen, err;

 	

	if (len < 0 || len > __NEW_UTS_LEN)

	if (len < 0)

		return -EINVAL;



 	down_read(&uts_sem);

 	

	nlen = strlen(system_utsname.domainname) + 1;

	if (nlen < len)

		len = nlen;

	err = -EINVAL;

	if (nlen > len)

		goto out;



	err = -EFAULT;

	if (!copy_to_user(name, system_utsname.domainname, len))

	if (!copy_to_user(name, system_utsname.domainname, nlen))

		err = 0;



out:

	up_read(&uts_sem);

	return err;

}

arch/sparc64/kernel/sys_sparc.c

+6 −4
Original line number Diff line number Diff line
@@ -707,19 +707,21 @@ asmlinkage long sys_getdomainname(char __user *name, int len) 
{

        int nlen, err;



	if (len < 0 || len > __NEW_UTS_LEN)

	if (len < 0)

		return -EINVAL;



 	down_read(&uts_sem);

 	

	nlen = strlen(system_utsname.domainname) + 1;

        if (nlen < len)

                len = nlen;

	err = -EINVAL;

	if (nlen > len)

		goto out;



	err = -EFAULT;

	if (!copy_to_user(name, system_utsname.domainname, len))

	if (!copy_to_user(name, system_utsname.domainname, nlen))

		err = 0;



out:

	up_read(&uts_sem);

	return err;

}