From 67e3663fc93c65b69b5d121db05b0833b98d97f1 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 17 Jun 2013 16:20:08 -0700
Subject: [PATCH] init: fix copying boot properties

The previous patch "init: verify size of property buffers passed
to property_get" incorrectly modified one of the callers,
resulting in ro.serialno, ro.bootmode, ro.baseband, and
ro.bootloader always being set to their default values.

Bug: 9469860
Change-Id: Id45bd8dd657e8d61f4cfaf7e6b2559d2bfd05181
---
 init/init.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/init/init.c b/init/init.c
index 94ffe1b7e..fd428b01f 100755
--- a/init/init.c
+++ b/init/init.c
@@ -640,7 +640,9 @@ static void export_kernel_boot_props(void)
 
     for (i = 0; i < ARRAY_SIZE(prop_map); i++) {
         ret = property_get(prop_map[i].src_prop, tmp);
-        if (ret == 0)
+        if (ret > 0)
+            property_set(prop_map[i].dest_prop, tmp);
+        else
             property_set(prop_map[i].dest_prop, prop_map[i].def_val);
     }