summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2024-01-02 17:10:56 -0500
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-01-03 07:17:48 +0000
commit7687a5cbdd8bb1dd9e6762544ffda88a81fb0aac (patch)
tree79d3a55fbab6f356a24e397d404e2cc623a9ce7a
parentMerge pull request #278370 from NixOS/backport-278345-to-release-23.11 (diff)
downloadnixpkgs-7687a5cbdd8bb1dd9e6762544ffda88a81fb0aac.tar.gz
qt6.qtbase: add patch for CVE-2023-51714origin/backport-278363-to-release-23.11
(cherry picked from commit ddc8bd3f51c73d03c1795b9d11621f6246af48e7)
-rw-r--r--pkgs/development/libraries/qt-6/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index 220e60f5c371..e67348a1d14a 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -62,6 +62,16 @@ let
revert = true;
hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A=";
})
+ # CVE-2023-51714: Potential Integer Overflow in Qt's HTTP2 implementation
+ # https://www.qt.io/blog/security-advisory-potential-integer-overflow-in-qts-http2-implementation
+ (fetchpatch2 {
+ url = "https://download.qt.io/official_releases/qt/6.5/0001-CVE-2023-51714-qtbase-6.5.diff";
+ hash = "sha256-0Xnolq9dWkKUrmLUlv15uQ9nkZXrY3AsmvChaLX8P2I=";
+ })
+ (fetchpatch2 {
+ url = "https://download.qt.io/official_releases/qt/6.6/0002-CVE-2023-51714-qtbase-6.6.diff";
+ hash = "sha256-+/u3vy5Ci6Z4jy00L07iYAnqHvVdqUzqVnT9uVIqs60=";
+ })
];
};
env = callPackage ./qt-env.nix { };