diff options
author | Connor O'Brien <connoro@google.com> | 2016-08-19 22:34:46 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-19 22:34:46 +0000 |
commit | 9745b11db15876b5081d2042093e13941823b661 (patch) | |
tree | c6dcef6835b0ab47de6a0c76618d3191b2bc49b5 /libsysutils | |
parent | fdb4cd42f6c8f78a17906adc4c1935aaf69245f6 (diff) | |
parent | e04054d9bba8c203b08f8caa01fdc2f2801dd18e (diff) | |
download | system_core-9745b11db15876b5081d2042093e13941823b661.tar.gz system_core-9745b11db15876b5081d2042093e13941823b661.tar.bz2 system_core-9745b11db15876b5081d2042093e13941823b661.zip |
Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4
am: e04054d9bb
Change-Id: Ia5f46e5b9622946ca0e44fbe7399729807d2d08a
Diffstat (limited to 'libsysutils')
-rw-r--r-- | libsysutils/src/FrameworkListener.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/libsysutils/src/FrameworkListener.cpp b/libsysutils/src/FrameworkListener.cpp index e7b3dd69a..579ead991 100644 --- a/libsysutils/src/FrameworkListener.cpp +++ b/libsysutils/src/FrameworkListener.cpp @@ -49,6 +49,7 @@ void FrameworkListener::init(const char *socketName UNUSED, bool withSeq) { errorRate = 0; mCommandCount = 0; mWithSeq = withSeq; + mSkipToNextNullByte = false; } bool FrameworkListener::onDataAvailable(SocketClient *c) { @@ -59,10 +60,15 @@ bool FrameworkListener::onDataAvailable(SocketClient *c) { if (len < 0) { SLOGE("read() failed (%s)", strerror(errno)); return false; - } else if (!len) + } else if (!len) { return false; - if(buffer[len-1] != '\0') + } else if (buffer[len-1] != '\0') { SLOGW("String is not zero-terminated"); + android_errorWriteLog(0x534e4554, "29831647"); + c->sendMsg(500, "Command too large for buffer", false); + mSkipToNextNullByte = true; + return false; + } int offset = 0; int i; @@ -70,11 +76,16 @@ bool FrameworkListener::onDataAvailable(SocketClient *c) { for (i = 0; i < len; i++) { if (buffer[i] == '\0') { /* IMPORTANT: dispatchCommand() expects a zero-terminated string */ - dispatchCommand(c, buffer + offset); + if (mSkipToNextNullByte) { + mSkipToNextNullByte = false; + } else { + dispatchCommand(c, buffer + offset); + } offset = i + 1; } } + mSkipToNextNullByte = false; return true; } |