Commit 20bf94e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Fix regression in sys_getdomainname()
  [OPENPROMIO]: Handle current_node being NULL correctly.
parents 77e2782f b9c54f91

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;

}

drivers/sbus/char/openprom.c

+10 −3
Original line number Diff line number Diff line
@@ -145,8 +145,9 @@ static int opromgetprop(void __user *argp, struct device_node *dp, struct openpr 
	void *pval;

	int len;



	pval = of_get_property(dp, op->oprom_array, &len);

	if (!pval || len <= 0 || len > bufsize)

	if (!dp ||

	    !(pval = of_get_property(dp, op->oprom_array, &len)) ||

	    len <= 0 || len > bufsize)

		return copyout(argp, op, sizeof(int));



	memcpy(op->oprom_array, pval, len);
@@ -161,6 +162,8 @@ static int opromnxtprop(void __user *argp, struct device_node *dp, struct openpr 
	struct property *prop;

	int len;



	if (!dp)

		return copyout(argp, op, sizeof(int));

	if (op->oprom_array[0] == '\0') {

		prop = dp->properties;

		if (!prop)
@@ -266,9 +269,13 @@ static int oprompci2node(void __user *argp, struct device_node *dp, struct openp 


static int oprompath2node(void __user *argp, struct device_node *dp, struct openpromio *op, int bufsize, DATA *data)

{

	phandle ph = 0;



	dp = of_find_node_by_path(op->oprom_array);

	if (dp)

		ph = dp->node;

	data->current_node = dp;

	*((int *)op->oprom_array) = dp->node;

	*((int *)op->oprom_array) = ph;

	op->oprom_size = sizeof(int);



	return copyout(argp, op, bufsize + sizeof(int));