From e24f5eab66a004fcbd770888aba9cd94fcda17c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 May 2020 23:18:09 +0200 Subject: treewide: add CVE identifiers to patches This allows tools like broken.sh to correctly identify the patched status. --- .../antiword/10_fix_buffer_overflow_wordole_c.patch | 18 ------------------ ...0_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch | 18 ++++++++++++++++++ pkgs/applications/office/antiword/default.nix | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch create mode 100644 pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch (limited to 'pkgs/applications') diff --git a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch deleted file mode 100644 index ebf2f0900d98..000000000000 --- a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Add check for buffer overflow with malformed input files -Author: -Bug-Debian: http://bugs.debian.org/407015 -Last-Update: 2009-06-03 - ---- antiword-0.37~/wordole.c 2005-08-26 21:49:57.000000000 +0200 -+++ antiword-0.37/wordole.c 2009-06-03 22:31:15.948014682 +0200 -@@ -259,6 +259,10 @@ - } - tNameSize = (size_t)usGetWord(0x40, aucBytes); - tNameSize = (tNameSize + 1) / 2; -+ if ( tNameSize > sizeof(atPPSlist[iIndex].szName)) { -+ werr(0, "Name Size of PPS %d is too large", iIndex); -+ tNameSize = sizeof(atPPSlist[iIndex].szName); -+ } - vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize); - atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes); - if (atPPSlist[iIndex].ucType == 5) { diff --git a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch new file mode 100644 index 000000000000..ebf2f0900d98 --- /dev/null +++ b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch @@ -0,0 +1,18 @@ +Description: Add check for buffer overflow with malformed input files +Author: +Bug-Debian: http://bugs.debian.org/407015 +Last-Update: 2009-06-03 + +--- antiword-0.37~/wordole.c 2005-08-26 21:49:57.000000000 +0200 ++++ antiword-0.37/wordole.c 2009-06-03 22:31:15.948014682 +0200 +@@ -259,6 +259,10 @@ + } + tNameSize = (size_t)usGetWord(0x40, aucBytes); + tNameSize = (tNameSize + 1) / 2; ++ if ( tNameSize > sizeof(atPPSlist[iIndex].szName)) { ++ werr(0, "Name Size of PPS %d is too large", iIndex); ++ tNameSize = sizeof(atPPSlist[iIndex].szName); ++ } + vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize); + atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes); + if (atPPSlist[iIndex].ucType == 5) { diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index 0154e21b374c..c8cb294b0dc0 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace "gcc" "cc" ''; - patches = [ ./10_fix_buffer_overflow_wordole_c.patch ]; + patches = [ ./10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch ]; installTargets = [ "global_install" ]; -- cgit 1.4.1