summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2024-01-03 10:21:05 -0500
committerGitHub <noreply@github.com>2024-01-03 10:21:05 -0500
commitba839a2fbb55ae346b458982a1f4096e68dd7985 (patch)
treee61e168263a045a3ac62a2f68826ae1398214757
parentMerge pull request #273136 from NixOS/backport-266935-to-release-23.11 (diff)
parentqt6.qtbase: add patch for CVE-2023-51714 (diff)
downloadnixpkgs-ba839a2fbb55ae346b458982a1f4096e68dd7985.tar.gz
Merge pull request #278441 from NixOS/backport-278363-to-release-23.11
[Backport release-23.11] qt6.qtbase: add patch for CVE-2023-51714
-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 { };