From fa99325beda30d012511878649227236cd3cbd73 Mon Sep 17 00:00:00 2001
From: Martin Habets <errandir_news@mph.eclipse.co.uk>
Date: Fri, 12 May 2006 12:53:59 -0700
Subject: [PATCH] --- yaml --- r: 26686 b: refs/heads/master c:
 586152560ae8df2a9babf1a8b667d7a145cb8208 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/sbus/char/openprom.c | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index fef17d7b2221..7f19d2ecaca4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06a1be167ea77c436657587e26cd4d7d6401784c
+refs/heads/master: 586152560ae8df2a9babf1a8b667d7a145cb8208
diff --git a/trunk/drivers/sbus/char/openprom.c b/trunk/drivers/sbus/char/openprom.c
index 383a95f34a0d..239e108b8ed1 100644
--- a/trunk/drivers/sbus/char/openprom.c
+++ b/trunk/drivers/sbus/char/openprom.c
@@ -392,13 +392,16 @@ static int openprom_bsd_ioctl(struct inode * inode, struct file * file,
 			return -ENOMEM;
 		}
 
-		prom_getproperty(op.op_nodeid, str, tmp, len);
-
-		tmp[len] = '\0';
+		cnt = prom_getproperty(op.op_nodeid, str, tmp, len);
+		if (cnt <= 0) {
+			error = -EINVAL;
+		} else {
+			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);