From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 19 Apr 2012 21:31:40 +0000 (+0000)
Subject: ar71xx: add sanity checks to decode_rle
X-Git-Tag: v19.07.0-rc1~24900
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5c9ca38e47cb254b6efe302a955939885340eb16;p=openwrt%2Fstaging%2Fhauke.git

ar71xx: add sanity checks to decode_rle

Also use -EINVAL instead of -1.

SVN-Revision: 31353
---

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
index 3e4a5527f8..30d8eac796 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
@@ -299,24 +299,29 @@ static int decode_rle(char *output, int len, char *in)
 {
 	char *ptr = output;
 	char *end = output + len;
+
+	if (!output || !in)
+		return -EINVAL;
+
 	while (*in) {
 		if (*in < 0) {
 			int i = -*in++;
 			while (i-- > 0) {
 				if (ptr >= end)
-					return -1;
+					return -EINVAL;
 				*ptr++ = *in++;
 			}
 		} else if (*in > 0) {
 			int i = *in++;
 			while (i-- > 0) {
 				if (ptr >= end)
-					return -1;
+					return -EINVAL;
 				*ptr++ = *in;
 			}
 			in++;
 		}
 	}
+
 	return ptr - output;
 }