Merge pull request #915 from Zokormazo/grep

grep: Fix CVE-2015-1345 heap buffer overrun
2015-02-17 12:54:34 +01:00 · 2015-02-17 12:54:34 +01:00 · d24359b730
commit d24359b730
parent 38ae2398c2 e0edca76da
2 changed files with 16 additions and 1 deletions
--- a/utils/grep/Makefile
+++ b/utils/grep/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=grep
 PKG_VERSION:=2.21
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/grep
--- a/utils/grep/patches/0001-grep-F-fix-a-heap-buffer-read-overrun.patch
+++ b/utils/grep/patches/0001-grep-F-fix-a-heap-buffer-read-overrun.patch
@ -0,0 +1,15 @@
+diff --git a/src/kwset.c b/src/kwset.c
+index 4003c8d..376f7c3 100644
+--- a/src/kwset.c
+++ b/src/kwset.c
+@@ -643,6 +643,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)
+                     if (! tp)
+                       return -1;
+                     tp++;
+                    if (ep <= tp)
+                      break;
+                   }
+               }
+           }
+--
+cgit v0.9.0.2