aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/libexif
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2020-11-08 16:37:40 +0100
committererictapen <justin.humm@posteo.de>2020-11-08 21:53:43 +0100
commit602d26e8bd6b45add7aef3bd528e9c20ad3a1249 (patch)
treeaa8f114431dc531b232bb2cf81183f174f1a9f65 /pkgs/development/libraries/libexif
parentb39390867307e040fc274003740c193769d7cff4 (diff)
libexif: apply patches for CVE-2020-0196, CVE-2020-0452
* CVE-2020-0198: unsigned integer overflow in exif_data_load_data_content * CVE-2020-0452: compiler optimization could remove an a bufferoverflow check, making a buffer overflow possible with some EXIF tags Fixes: CVE-2020-0196, CVE-2020-0452
Diffstat (limited to 'pkgs/development/libraries/libexif')
-rw-r--r--pkgs/development/libraries/libexif/default.nix16
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index fd2ed39e34a4..a0f831e927ef 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gettext }:
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }:
stdenv.mkDerivation rec {
pname = "libexif";
@@ -11,6 +11,20 @@ stdenv.mkDerivation rec {
sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2020-0198.patch";
+ url = "https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c.patch";
+ sha256 = "1040278g5dbq3vvlyk8cmzb7flpi9bfsp99268hw69i6ilwbdf2k";
+ })
+ (fetchpatch {
+ name = "CVE-2020-0452.patch";
+ url = "https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06.patch";
+ excludes = [ "NEWS" ];
+ sha256 = "0k4z1gbbkli6wwyy9qm2qvn0h00qda6wqym61nmmbys7yc2zryj6";
+ })
+ ];
+
nativeBuildInputs = [ autoreconfHook gettext ];
meta = with stdenv.lib; {