-
Notifications
You must be signed in to change notification settings - Fork 565
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patch influxdb to resolve CVE-2023-45288 (#10686)
Signed-off-by: Sumynwa <[email protected]>
- Loading branch information
Showing
2 changed files
with
86 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
From ba872109ef2dc8f1da778651bd1fd3792d0e4587 Mon Sep 17 00:00:00 2001 | ||
From: Damien Neil <[email protected]> | ||
Date: Wed, 10 Jan 2024 13:41:39 -0800 | ||
Subject: [PATCH] http2: close connections when receiving too many headers | ||
|
||
Maintaining HPACK state requires that we parse and process | ||
all HEADERS and CONTINUATION frames on a connection. | ||
When a request's headers exceed MaxHeaderBytes, we don't | ||
allocate memory to store the excess headers but we do | ||
parse them. This permits an attacker to cause an HTTP/2 | ||
endpoint to read arbitrary amounts of data, all associated | ||
with a request which is going to be rejected. | ||
|
||
Set a limit on the amount of excess header frames we | ||
will process before closing a connection. | ||
|
||
Thanks to Bartek Nowotarski for reporting this issue. | ||
|
||
Fixes CVE-2023-45288 | ||
Fixes golang/go#65051 | ||
|
||
Change-Id: I15df097268df13bb5a9e9d3a5c04a8a141d850f6 | ||
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/2130527 | ||
Reviewed-by: Roland Shoemaker <[email protected]> | ||
Reviewed-by: Tatiana Bradley <[email protected]> | ||
Reviewed-on: https://go-review.googlesource.com/c/net/+/576155 | ||
Reviewed-by: Dmitri Shuralyov <[email protected]> | ||
Auto-Submit: Dmitri Shuralyov <[email protected]> | ||
Reviewed-by: Than McIntosh <[email protected]> | ||
LUCI-TryBot-Result: Go LUCI <[email protected]> | ||
--- | ||
|
||
diff --git a/vendor/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go | ||
index e2b298d..a5a9441 100644 | ||
--- a/vendor/golang.org/x/net/http2/frame.go | ||
+++ b/vendor/golang.org/x/net/http2/frame.go | ||
@@ -1564,6 +1564,7 @@ | ||
if size > remainSize { | ||
hdec.SetEmitEnabled(false) | ||
mh.Truncated = true | ||
+ remainSize = 0 | ||
return | ||
} | ||
remainSize -= size | ||
@@ -1576,6 +1577,36 @@ | ||
var hc headersOrContinuation = hf | ||
for { | ||
frag := hc.HeaderBlockFragment() | ||
+ | ||
+ // Avoid parsing large amounts of headers that we will then discard. | ||
+ // If the sender exceeds the max header list size by too much, | ||
+ // skip parsing the fragment and close the connection. | ||
+ // | ||
+ // "Too much" is either any CONTINUATION frame after we've already | ||
+ // exceeded the max header list size (in which case remainSize is 0), | ||
+ // or a frame whose encoded size is more than twice the remaining | ||
+ // header list bytes we're willing to accept. | ||
+ if int64(len(frag)) > int64(2*remainSize) { | ||
+ if VerboseLogs { | ||
+ log.Printf("http2: header list too large") | ||
+ } | ||
+ // It would be nice to send a RST_STREAM before sending the GOAWAY, | ||
+ // but the struture of the server's frame writer makes this difficult. | ||
+ return nil, ConnectionError(ErrCodeProtocol) | ||
+ } | ||
+ | ||
+ // Also close the connection after any CONTINUATION frame following an | ||
+ // invalid header, since we stop tracking the size of the headers after | ||
+ // an invalid one. | ||
+ if invalid != nil { | ||
+ if VerboseLogs { | ||
+ log.Printf("http2: invalid header: %v", invalid) | ||
+ } | ||
+ // It would be nice to send a RST_STREAM before sending the GOAWAY, | ||
+ // but the struture of the server's frame writer makes this difficult. | ||
+ return nil, ConnectionError(ErrCodeProtocol) | ||
+ } | ||
+ | ||
if _, err := hdec.Write(frag); err != nil { | ||
return nil, ConnectionError(ErrCodeCompression) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ | |
Summary: Scalable datastore for metrics, events, and real-time analytics | ||
Name: influxdb | ||
Version: 2.7.3 | ||
Release: 5%{?dist} | ||
Release: 6%{?dist} | ||
License: MIT | ||
Vendor: Microsoft Corporation | ||
Distribution: Azure Linux | ||
|
@@ -58,6 +58,7 @@ Source6: influxdb-user.conf | |
Patch0: CVE-2021-4238.patch | ||
Patch1: CVE-2019-0205.patch | ||
Patch2: CVE-2024-6104.patch | ||
Patch3: CVE-2023-45288.patch | ||
BuildRequires: clang | ||
BuildRequires: golang | ||
BuildRequires: kernel-headers | ||
|
@@ -147,6 +148,9 @@ go test ./... | |
%{_tmpfilesdir}/influxdb.conf | ||
|
||
%changelog | ||
* Thu Oct 10 2024 Sumedh Sharma <[email protected]> - 2.7.3-6 | ||
- Add patch to resolve CVE-2023-45288. | ||
|
||
* Thu Aug 01 2024 Bala <[email protected]> - 2.7.3-5 | ||
- Patched CVE-2024-6104 | ||
|
||
|