diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-04-30 01:20:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-30 01:20:46 +0200 |
| commit | 14269ee3f81ca20f72d26dc0fb7ffb5c4e598e10 (patch) | |
| tree | 4317cbf810bbca2c007b264bcd91bc639f242422 | |
| parent | geekbench: init at 4.4.4 (diff) | |
| parent | cifs-utils: fix information disclosure in logger (diff) | |
| download | nixpkgs-14269ee3f81ca20f72d26dc0fb7ffb5c4e598e10.tar.gz | |
Merge pull request #170949 from NixOS/backport-170778-to-release-21.11
| -rw-r--r-- | pkgs/os-specific/linux/cifs-utils/default.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 8c587a401960..b588482bf65a 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config +{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, docutils, pkg-config , libkrb5, keyutils, pam, talloc, python3 }: stdenv.mkDerivation rec { @@ -10,6 +10,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-Q9h4bIYTysz6hJEwgcHWK8JAlXWFTPiVsFtIrwhj0FY="; }; + patches = [ + (fetchpatch { + # Fix buffer-overflow in handling of ip= parameter in mount.cifs + # https://www.openwall.com/lists/oss-security/2022/04/27/5 + name = "CVE-2022-27239.patch"; + url = "https://github.com/piastry/cifs-utils/commit/007c07fd91b6d42f8bd45187cf78ebb06801139d.patch"; + sha256 = "sha256-3uoHso2q17r2bcEW+ZjYUWsW4OIGYA7kxYZxQQy0JOg="; + }) + (fetchpatch { + # Fix disclosure of invalid credential configuration in verbose mode + name = "CVE-2022-29869.patch"; + url = "https://github.com/piastry/cifs-utils/commit/8acc963a2e7e9d63fe1f2e7f73f5a03f83d9c379.patch"; + sha256 = "sha256-MjfreeL1ME550EYK9LPOUAAjIk1BoMGfb+pQe3A1bz8="; + }) + ]; + nativeBuildInputs = [ autoreconfHook docutils pkg-config ]; buildInputs = [ libkrb5 keyutils pam talloc python3 ]; |