commit fe86c8fad2bf867b5525e7105d548b91a7c36f2c
author The Android Automerger <android-build@google.com> Tue Sep 17 17:40:03 2013 -0700
committer The Android Automerger <android-build@google.com> Tue Sep 17 17:40:03 2013 -0700
tree 042fe6e0a9613b1beef36ecda742f5620c17a27b
parent 6adbcbff33abc3bb4499dda0e76f86cb86d4a181
parent 2880aaee77fe1101197da0df08963e421b34c1b0

merge in klp-release history after reset to klp-dev

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index 9ac2781..9afc756 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -276,34 +276,6 @@
     }
 }
 
-static bool is_legal_property_name(const char* name, size_t namelen)
-{
-    size_t i;
-    bool previous_was_dot = false;
-    if (namelen >= PROP_NAME_MAX) return false;
-    if (namelen < 1) return false;
-    if (name[0] == '.') return false;
-    if (name[namelen - 1] == '.') return false;
-
-    /* Only allow alphanumeric, plus '.', '-', or '_' */
-    /* Don't allow ".." to appear in a property name */
-    for (i = 0; i < namelen; i++) {
-        if (name[i] == '.') {
-            if (previous_was_dot == true) return false;
-            previous_was_dot = true;
-            continue;
-        }
-        previous_was_dot = false;
-        if (name[i] == '_' || name[i] == '-') continue;
-        if (name[i] >= 'a' && name[i] <= 'z') continue;
-        if (name[i] >= 'A' && name[i] <= 'Z') continue;
-        if (name[i] >= '0' && name[i] <= '9') continue;
-        return false;
-    }
-
-    return true;
-}
-
 int property_set(const char *name, const char *value)
 {
     prop_info *pi;
@@ -312,8 +284,9 @@
     size_t namelen = strlen(name);
     size_t valuelen = strlen(value);
 
-    if (!is_legal_property_name(name, namelen)) return -1;
-    if (valuelen >= PROP_VALUE_MAX) return -1;
+    if(namelen >= PROP_NAME_MAX) return -1;
+    if(valuelen >= PROP_VALUE_MAX) return -1;
+    if(namelen < 1) return -1;
 
     pi = (prop_info*) __system_property_find(name);
 
@@ -325,7 +298,7 @@
     } else {
         ret = __system_property_add(name, namelen, value, valuelen);
         if (ret < 0) {
-            ERROR("Failed to set '%s'='%s'\n", name, value);
+            ERROR("Failed to set '%s'='%s'", name, value);
             return ret;
         }
     }
@@ -391,12 +364,6 @@
         msg.name[PROP_NAME_MAX-1] = 0;
         msg.value[PROP_VALUE_MAX-1] = 0;
 
-        if (!is_legal_property_name(msg.name, strlen(msg.name))) {
-            ERROR("sys_prop: illegal property name. Got: \"%s\"\n", msg.name);
-            close(s);
-            return;
-        }
-
         getpeercon(s, &source_ctx);
 
         if(memcmp(msg.name,"ctl.",4) == 0) {