GT-I9300_JB_Opensource_Update9

gokhanmoral · Apr 1, 2013 · 8a4d9a5 · 8a4d9a5
1 parent c614f42
commit 8a4d9a5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/arch/arm/configs/m0_00_defconfig b/arch/arm/configs/m0_00_defconfig
@@ -1210,6 +1210,7 @@ CONFIG_UID_STAT=y
 # CONFIG_2MIC_FM34_WE395 is not set
 CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK=y
 CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK=y
+CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK=y
 # CONFIG_USBHUB_USB3503 is not set
 # CONFIG_PN544 is not set
 # CONFIG_STMPE811_ADC is not set

diff --git a/kernel/sys.c b/kernel/sys.c
@@ -1138,15 +1138,16 @@ DECLARE_RWSEM(uts_sem);
  * Work around broken programs that cannot handle "Linux 3.0".
  * Instead we map 3.x to 2.6.40+x, so e.g. 3.0 would be 2.6.40
  */
-static int override_release(char __user *release, int len)
+static int override_release(char __user *release, size_t len)
 {
 	int ret = 0;
-	char buf[65];
 
 	if (current->personality & UNAME26) {
-		char *rest = UTS_RELEASE;
+		const char *rest = UTS_RELEASE;
+		char buf[65] = { 0 };
 		int ndots = 0;
 		unsigned v;
+		size_t copy;
 
 		while (*rest) {
 			if (*rest == '.' && ++ndots >= 3)
@@ -1156,8 +1157,9 @@ static int override_release(char __user *release, int len)
 			rest++;
 		}
 		v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
-		snprintf(buf, len, "2.6.%u%s", v, rest);
+		copy = min(sizeof(buf), max_t(size_t, 1, len));
-		ret = copy_to_user(release, buf, len);
+		copy = scnprintf(buf, copy, "2.6.%u%s", v, rest);
+		ret = copy_to_user(release, buf, copy + 1);
 	}
 	return ret;
 }