[SPARC]: Fix warning on prom_getproperty in openprom.c

Signed-off-by: Martin Habets <errandir_news@mph.eclipse.co.uk> Signed-off-by: David S. Miller <davem@davemloft.net>

[SPARC]: Fix warning on prom_getproperty in openprom.c
Signed-off-by: Martin Habets <errandir_news@mph.eclipse.co.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Martin Habets · David S. Miller
1 parent 06a1be167e
Showing 1 changed file with 9 additions and 6 deletions Side-by-side Diff
drivers/sbus/char/openprom.c
@@ -392,13 +392,16 @@
 			return -ENOMEM;
 		}
  
-		prom_getproperty(op.op_nodeid, str, tmp, len);
+		cnt = prom_getproperty(op.op_nodeid, str, tmp, len);
+		if (cnt <= 0) {
+			error = -EINVAL;
+		} else {
+			tmp[len] = '\0';
  
-		tmp[len] = '\0';
-
-		if (__copy_to_user(argp, &op, sizeof(op)) != 0
-		    || copy_to_user(op.op_buf, tmp, len) != 0)
-			error = -EFAULT;
+			if (__copy_to_user(argp, &op, sizeof(op)) != 0 ||
+			    copy_to_user(op.op_buf, tmp, len) != 0)
+				error = -EFAULT;
+		}
  
 		kfree(tmp);
 		kfree(str);
...	...	@@ -392,13 +392,16 @@
392	392	return -ENOMEM;
393	393	}
394	394
395		- prom_getproperty(op.op_nodeid, str, tmp, len);
	395	+ cnt = prom_getproperty(op.op_nodeid, str, tmp, len);
	396	+ if (cnt <= 0) {
	397	+ error = -EINVAL;
	398	+ } else {
	399	+ tmp[len] = '\0';
396	400
397		- tmp[len] = '\0';
398		-
399		- if (__copy_to_user(argp, &op, sizeof(op)) != 0
400		- \|\| copy_to_user(op.op_buf, tmp, len) != 0)
401		- error = -EFAULT;
	401	+ if (__copy_to_user(argp, &op, sizeof(op)) != 0 \|\|
	402	+ copy_to_user(op.op_buf, tmp, len) != 0)
	403	+ error = -EFAULT;
	404	+ }
402	405
403	406	kfree(tmp);
404	407	kfree(str);