nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 20:00:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #170949 from NixOS/backport-170778-to-release-21.11

Browse Source
This commit is contained in:
Martin Weinelt
2022-04-30 01:20:46 +02:00
committed by GitHub
parent 107e032e08 e7702d7c38
commit 14269ee3f8
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/os-specific/linux/cifs-utils/default.nix
View File

@@ -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 ];