diff options
| author | Robin Gloster <mail@glob.in> | 2016-01-29 05:25:51 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-01-30 16:36:57 +0000 |
| commit | cce1bad2e17d37d2d9ca198e2b3fb1b658fdcdb4 (patch) | |
| tree | 10839b46475e4bad2b8f05ffaccbd3f2bbf13d16 /pkgs/os-specific/linux/dmraid | |
| parent | e721382448fdbf8002e9b0121c3ae11f5701261e (diff) | |
| download | nixpkgs-cce1bad2e17d37d2d9ca198e2b3fb1b658fdcdb4.tar nixpkgs-cce1bad2e17d37d2d9ca198e2b3fb1b658fdcdb4.tar.gz nixpkgs-cce1bad2e17d37d2d9ca198e2b3fb1b658fdcdb4.tar.bz2 nixpkgs-cce1bad2e17d37d2d9ca198e2b3fb1b658fdcdb4.tar.lz nixpkgs-cce1bad2e17d37d2d9ca198e2b3fb1b658fdcdb4.tar.xz nixpkgs-cce1bad2e17d37d2d9ca198e2b3fb1b658fdcdb4.tar.zst nixpkgs-cce1bad2e17d37d2d9ca198e2b3fb1b658fdcdb4.zip | |
dmraid: add patch to build with format hardening
Diffstat (limited to 'pkgs/os-specific/linux/dmraid')
| -rw-r--r-- | pkgs/os-specific/linux/dmraid/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/dmraid/hardening-format.patch | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index 9e7e2a6bb8e..9412747d6bc 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq"; }; + patches = [ ./hardening-format.patch ]; + postPatch = '' sed -i 's/\[\[[^]]*\]\]/[ "''$''${n##*.}" = "so" ]/' */lib/Makefile.in ''; diff --git a/pkgs/os-specific/linux/dmraid/hardening-format.patch b/pkgs/os-specific/linux/dmraid/hardening-format.patch new file mode 100644 index 00000000000..f91a7fb18aa --- /dev/null +++ b/pkgs/os-specific/linux/dmraid/hardening-format.patch @@ -0,0 +1,18 @@ +--- a/1.0.0.rc16/lib/events/libdmraid-events-isw.c 2016-01-29 05:16:57.455425454 +0000 ++++ b/1.0.0.rc16/lib/events/libdmraid-events-isw.c 2016-01-29 05:17:55.520564013 +0000 +@@ -838,13 +838,13 @@ + + sz = _log_all_devs(log_type, rs, NULL, 0); + if (!sz) { +- syslog(LOG_ERR, msg[0]); ++ syslog(LOG_ERR, "%s", msg[0]); + return; + } + + str = dm_malloc(++sz); + if (!str) { +- syslog(LOG_ERR, msg[1]); ++ syslog(LOG_ERR, "%s", msg[1]); + return; + } + |