[zookeeper] 01/01: Import Debian patch 3.3.5+dfsg1-2+deb7u1

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch wheezy
in repository zookeeper.

commit 06446a3245df945bbb2a3e0783271c88249b2203
Author: Markus Koschany <apo at debian.org>
Date:   Sun Sep 18 20:14:02 2016 +0200

    Import Debian patch 3.3.5+dfsg1-2+deb7u1
---
 debian/changelog                   | 12 ++++++++++++
 debian/patches/CVE-2016-5017.patch | 37 +++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b609625..bc4ecaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+zookeeper (3.3.5+dfsg1-2+deb7u1) wheezy-security; urgency=high
+
+  * Non-maintainer upload by the LTS team.
+  * Fix CVE-2016-5017:
+    Lyon Yang discovered that the C client shells cli_st and cli_mt of Apache
+    Zookeeper, a high-performance coordination service for distributed
+    applications, were affected by a buffer overflow vulnerability associated
+    with parsing of the input command when using the "cmd:" batch mode syntax.
+    If the command string exceeds 1024 characters a buffer overflow will occur.
+
+ -- Markus Koschany <apo at debian.org>  Sun, 18 Sep 2016 20:14:02 +0200
+
 zookeeper (3.3.5+dfsg1-2) unstable; urgency=low
 
   * d/patches/fixes/ZOOKEEPER-1431: Fix up memory leak in zookeeper
diff --git a/debian/patches/CVE-2016-5017.patch b/debian/patches/CVE-2016-5017.patch
new file mode 100644
index 0000000..8d0a2b2
--- /dev/null
+++ b/debian/patches/CVE-2016-5017.patch
@@ -0,0 +1,37 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 18 Sep 2016 19:57:53 +0200
+Subject: CVE-2016-5017
+
+Lyon Yang discovered that the C client shells cli_st and cli_mt of Apache
+Zookeeper, a high-performance coordination service for distributed
+applications, were affected by a buffer overflow vulnerability associated with
+parsing of the input command when using the "cmd:" batch mode syntax. If the
+command string exceeds 1024 characters a buffer overflow will occur.
+
+
+Origin: https://git-wip-us.apache.org/repos/asf?p=zookeeper.git;a=commitdiff;h=27ecf981a15554dc8e64a28630af7a5c9e2bdf4f
+---
+ src/c/src/cli.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/c/src/cli.c b/src/c/src/cli.c
+index c4538a6..959dd99 100644
+--- a/src/c/src/cli.c
++++ b/src/c/src/cli.c
+@@ -486,7 +486,15 @@ int main(int argc, char **argv) {
+     }
+     if (argc > 2) {
+       if(strncmp("cmd:",argv[2],4)==0){
+-        strcpy(cmd,argv[2]+4);
++        size_t cmdlen = strlen(argv[2]);
++        if (cmdlen > sizeof(cmd)) {
++            fprintf(stderr,
++                    "Command length %zu exceeds max length of %zu\n",
++                    cmdlen,
++                    sizeof(cmd));
++            return 2;
++        }
++        strncpy(cmd, argv[2]+4, sizeof(cmd));
+         batchMode=1;
+         fprintf(stderr,"Batch mode: %s\n",cmd);
+       }else{
diff --git a/debian/patches/series b/debian/patches/series
index 4b62d71..1103ef2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fixes/ZOOKEEPER-1374
 fixes/ZOOKEEPER-1403
 ftbfs-gcc-4.7.diff
 fixes/ZOOKEEPER-1431
+CVE-2016-5017.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/zookeeper.git