From 7a4f260c5df43caa2f522e739b7cc3e7595d7e09 Mon Sep 17 00:00:00 2001
From: Beth Griggs <bgriggs@redhat.com>
Date: Mon, 22 Feb 2021 01:13:01 +0000
Subject: [PATCH] 2021-02-23, Version 15.10.0 (Current)

This is a security release.

Notable changes:

Vulnerabilities fixed:

- **CVE-2021-22883**: HTTP2 'unknownProtocol' cause Denial of Service by
    resource exhaustion
- **CVE-2021-22884**: DNS rebinding in --inspect
- **CVE-2021-23840**: OpenSSL - Integer overflow in CipherUpdate

PR-URL: https://github.com/nodejs-private/node-private/pull/253
---
 CHANGELOG.md                    |  3 ++-
 doc/api/http2.md                |  6 +++---
 doc/changelogs/CHANGELOG_V15.md | 25 +++++++++++++++++++++++++
 src/node_version.h              |  6 +++---
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dc6061fc0f33a..e7f7332c7dda91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,7 +32,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V15.md#15.9.0">15.9.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V15.md#15.10.0">15.10.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V15.md#15.9.0">15.9.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V15.md#15.8.0">15.8.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V15.md#15.7.0">15.7.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V15.md#15.6.0">15.6.0</a><br/>
diff --git a/doc/api/http2.md b/doc/api/http2.md
index edfc235bfa2ca3..78b2f5f16fa0c5 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -2122,7 +2122,7 @@ Throws `ERR_INVALID_ARG_TYPE` for invalid `settings` argument.
 <!-- YAML
 added: v8.4.0
 changes:
-  - version: REPLACEME
+  - version: v15.10.0
     pr-url: https://github.com/nodejs-private/node-private/pull/246
     description: Added `unknownProtocolTimeout` option with a default of 10000.
   - version:
@@ -2271,7 +2271,7 @@ server.listen(80);
 <!-- YAML
 added: v8.4.0
 changes:
-  - version: REPLACEME
+  - version: v15.10.0
     pr-url: https://github.com/nodejs-private/node-private/pull/246
     description: Added `unknownProtocolTimeout` option with a default of 10000.
   - version:
@@ -2407,7 +2407,7 @@ server.listen(80);
 <!-- YAML
 added: v8.4.0
 changes:
-  - version: REPLACEME
+  - version: v15.10.0
     pr-url: https://github.com/nodejs-private/node-private/pull/246
     description: Added `unknownProtocolTimeout` option with a default of 10000.
   - version:
diff --git a/doc/changelogs/CHANGELOG_V15.md b/doc/changelogs/CHANGELOG_V15.md
index 3ce3d94b1b2941..7033bdc30bbb52 100644
--- a/doc/changelogs/CHANGELOG_V15.md
+++ b/doc/changelogs/CHANGELOG_V15.md
@@ -10,6 +10,7 @@
 </tr>
 <tr>
 <td>
+<a href="#15.10.0">15.10.0</a><br/>
 <a href="#15.9.0">15.9.0</a><br/>
 <a href="#15.8.0">15.8.0</a><br/>
 <a href="#15.7.0">15.7.0</a><br/>
@@ -44,6 +45,30 @@
   * [io.js](CHANGELOG_IOJS.md)
   * [Archive](CHANGELOG_ARCHIVE.md)
 
+<a id="15.10.0"></a>
+## 2021-02-23, Version 15.10.0 (Current), @BethGriggs
+
+This is a security release.
+
+### Notable changes
+
+Vulnerabilities fixed:
+
+* **CVE-2021-22883**: HTTP2 'unknownProtocol' cause Denial of Service by resource exhaustion
+  * Affected Node.js versions are vulnerable to denial of service attacks when too many connection attempts with an 'unknownProtocol' are established. This leads to a leak of file descriptors. If a file descriptor limit is configured on the system, then the server is unable to accept new connections and prevent the process also from opening, e.g. a file. If no file descriptor limit is configured, then this lead to an excessive memory usage and cause the system to run out of memory.
+* **CVE-2021-22884**: DNS rebinding in --inspect
+  * Affected Node.js versions are vulnerable to denial of service attacks when the whitelist includes “localhost6”. When “localhost6” is not present in /etc/hosts, it is just an ordinary domain that is resolved via DNS, i.e., over network. If the attacker controls the victim's DNS server or can spoof its responses, the DNS rebinding protection can be bypassed by using the “localhost6” domain. As long as the attacker uses the “localhost6” domain, they can still apply the attack described in CVE-2018-7160.
+* **CVE-2021-23840**: OpenSSL - Integer overflow in CipherUpdate
+  * This is a vulnerability in OpenSSL which may be exploited through Node.js. You can read more about it in
+https://www.openssl.org/news/secadv/20210216.txt
+
+### Commits
+
+* [[`2a3ce5974b`](https://github.com/nodejs/node/commit/2a3ce5974b)] - **deps**: update archs files for OpenSSL-1.1.1j (Daniel Bevenius) [#37412](https://github.com/nodejs/node/pull/37412)
+* [[`afbce66874`](https://github.com/nodejs/node/commit/afbce66874)] - **deps**: upgrade openssl sources to 1.1.1j (Daniel Bevenius) [#37412](https://github.com/nodejs/node/pull/37412)
+* [[`4184806dee`](https://github.com/nodejs/node/commit/4184806dee)] - **(SEMVER-MINOR)** **http2**: add unknownProtocol timeout (Daniel Bevenius) [nodejs-private/node-private#246](https://github.com/nodejs-private/node-private/pull/246)
+* [[`43ae9c46c3`](https://github.com/nodejs/node/commit/43ae9c46c3)] - **src**: drop localhost6 as allowed host for inspector (Matteo Collina) [nodejs-private/node-private#244](https://github.com/nodejs-private/node-private/pull/244)
+
 <a id="15.9.0"></a>
 ## 2021-02-17, Version 15.9.0 (Current), @danielleadams
 
diff --git a/src/node_version.h b/src/node_version.h
index cd0810e17a83fa..0f101a76d0b614 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -23,13 +23,13 @@
 #define SRC_NODE_VERSION_H_
 
 #define NODE_MAJOR_VERSION 15
-#define NODE_MINOR_VERSION 9
-#define NODE_PATCH_VERSION 1
+#define NODE_MINOR_VERSION 10
+#define NODE_PATCH_VERSION 0
 
 #define NODE_VERSION_IS_LTS 0
 #define NODE_VERSION_LTS_CODENAME ""
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)