From 16e1d9f3c89f23ea96796ad83b2fccbcc446e86c Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 11 Dec 2009 15:48:23 -0800
Subject: [PATCH] --- yaml --- r: 176203 b: refs/heads/master c:
 a01c7800420d2c294ca403988488a635d4087a6d h: refs/heads/master i:   176201:
 8f2c1b74f376f468b8d39904ae2e777de6edb66c   176199:
 92109335af1e1dd82a68ccff9217f501333a5add v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/char/nvram.c | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 67be808cc5b0..2c3f0efc4954 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b925585039cf39275c2e0e57512e5df27fa73aad
+refs/heads/master: a01c7800420d2c294ca403988488a635d4087a6d
diff --git a/trunk/drivers/char/nvram.c b/trunk/drivers/char/nvram.c
index 4008e2ce73c1..fdbcc9fd6d31 100644
--- a/trunk/drivers/char/nvram.c
+++ b/trunk/drivers/char/nvram.c
@@ -264,10 +264,16 @@ static ssize_t nvram_write(struct file *file, const char __user *buf,
 	unsigned char contents[NVRAM_BYTES];
 	unsigned i = *ppos;
 	unsigned char *tmp;
-	int len;
 
-	len = (NVRAM_BYTES - i) < count ? (NVRAM_BYTES - i) : count;
-	if (copy_from_user(contents, buf, len))
+	if (i >= NVRAM_BYTES)
+		return 0;	/* Past EOF */
+
+	if (count > NVRAM_BYTES - i)
+		count = NVRAM_BYTES - i;
+	if (count > NVRAM_BYTES)
+		return -EFAULT;	/* Can't happen, but prove it to gcc */
+
+	if (copy_from_user(contents, buf, count))
 		return -EFAULT;
 
 	spin_lock_irq(&rtc_lock);
@@ -275,7 +281,7 @@ static ssize_t nvram_write(struct file *file, const char __user *buf,
 	if (!__nvram_check_checksum())
 		goto checksum_err;
 
-	for (tmp = contents; count-- > 0 && i < NVRAM_BYTES; ++i, ++tmp)
+	for (tmp = contents; count--; ++i, ++tmp)
 		__nvram_write_byte(*tmp, i);
 
 	__nvram_set_checksum();