commit 00860da2f053275442cc5475c52462df510fcaa3
author Iliyan Malchev <malchev@google.com> Mon Sep 19 22:16:19 2016 -0700
committer Steven Moreland <smoreland@google.com> Mon Oct 24 08:46:06 2016 -0700
tree 548e4e8e2a434ac099d4a8fad81f2c40eec3e273
parent 0ca2fe4c43e4d525979befd0a59d80fb0a9fa649

init: account for "init.svc." prefix in IsValidName

For each service ${service} described in a .rc file, init creates the
property init.svc.${service}.  This implies that service-name lengths
are bound by the maximum size of a property.  This patch accounts for
the "init.svc." prefix and the maximum property-name length when
validating a service name.

Test: pass

Change-Id: I32dffa37363b41a8211f7644600b81973d30a3b2
Signed-off-by: Iliyan Malchev <malchev@google.com>

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 22fb013..685befd 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -996,7 +996,7 @@
 }
 
 bool ServiceParser::IsValidName(const std::string& name) const {
-    if (name.size() > 16) {
+    if (name.size() > PROP_NAME_MAX - sizeof("init.svc.")) {
         return false;
     }
     for (const auto& c : name) {