diff options
author | Doug Zongker <dougz@google.com> | 2014-05-16 14:58:32 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-16 14:58:33 +0000 |
commit | 3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd (patch) | |
tree | b0e672cc873eba3b530132f139eb77e4b31661c6 | |
parent | d27aa76a6ff6436cfb8340bf3d04aba186cc4de1 (diff) | |
parent | 4aa12dd0decafb139239779ab38e6ffda23109ab (diff) | |
download | bootable_recovery-3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd.zip bootable_recovery-3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd.tar.gz bootable_recovery-3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd.tar.bz2 |
Merge "fix vulnerability in bspatch"
-rw-r--r-- | applypatch/bspatch.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/applypatch/bspatch.c b/applypatch/bspatch.c index 2e80f81..1dc7ab1 100644 --- a/applypatch/bspatch.c +++ b/applypatch/bspatch.c @@ -205,6 +205,11 @@ int ApplyBSDiffPatchMem(const unsigned char* old_data, ssize_t old_size, ctrl[1] = offtin(buf+8); ctrl[2] = offtin(buf+16); + if (ctrl[0] < 0 || ctrl[1] < 0) { + printf("corrupt patch (negative byte counts)\n"); + return 1; + } + // Sanity check if (newpos + ctrl[0] > *new_size) { printf("corrupt patch (new file overrun)\n"); |