This is an automated email from the ASF dual-hosted git repository.
maoling pushed a commit to branch branch-3.7
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.7 by this push:
new 1d79ab4 ZOOKEEPER-4414: Update Netty to 4.1.70.Final
1d79ab4 is described below
commit 1d79ab4b16593f426b258f4c364fc59dee693b04
Author: Frederiko Costa <[email protected]>
AuthorDate: Sat Nov 27 14:50:35 2021 +0800
ZOOKEEPER-4414: Update Netty to 4.1.70.Final
This PR updates Netty to 4.1.70 Final on master. This addresses the
following CVEs:
* CVE-2021-37136
* Netty
codec/src/main/java/io/netty/handler/codec/compression/Lz4FrameEncoder.java
Lz4FrameEncoder::finishEncode() Function Buffer Overflow
* CVE-2021-37137
Author: Frederiko Costa <[email protected]>
Reviewers: maoling <[email protected]>
Closes #1775 from frederiko/netty-4.1.70.Final
(cherry picked from commit 01f935cdebd582211e6d4eef9f81da4228412911)
Signed-off-by: maoling <[email protected]>
---
pom.xml | 2 +-
...n-4.1.63.Final.LICENSE.txt => netty-buffer-4.1.70.Final.LICENSE.txt} | 0
...ll-4.1.63.Final.LICENSE.txt => netty-codec-4.1.70.Final.LICENSE.txt} | 0
...t-4.1.63.Final.LICENSE.txt => netty-common-4.1.70.Final.LICENSE.txt} | 0
...-4.1.63.Final.LICENSE.txt => netty-handler-4.1.70.Final.LICENSE.txt} | 0
...4.1.63.Final.LICENSE.txt => netty-resolver-4.1.70.Final.LICENSE.txt} | 0
....1.63.Final.LICENSE.txt => netty-transport-4.1.70.Final.LICENSE.txt} | 0
...ICENSE.txt => netty-transport-native-epoll-4.1.70.Final.LICENSE.txt} | 0
....txt => netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt} | 0
9 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3aaf3fb..2ecaf86 100755
--- a/pom.xml
+++ b/pom.xml
@@ -437,7 +437,7 @@
<mockito.version>3.6.28</mockito.version>
<hamcrest.version>2.2</hamcrest.version>
<commons-cli.version>1.4</commons-cli.version>
- <netty.version>4.1.63.Final</netty.version>
+ <netty.version>4.1.70.Final</netty.version>
<jetty.version>9.4.43.v20210629</jetty.version>
<jackson.version>2.10.5.1</jackson.version>
<jline.version>2.14.6</jline.version>
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.63.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.63.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.70.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.63.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.63.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-codec-4.1.70.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.63.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-common-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-4.1.63.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-common-4.1.70.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.63.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.63.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-handler-4.1.70.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.63.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-handler-4.1.63.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.70.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-common-4.1.63.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-common-4.1.63.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-4.1.70.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.63.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-codec-4.1.63.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.70.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.63.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.63.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt
