lede-packages-rs

commit d24359b7304414bb2193df0c9c9fc1433b0d6c46
parent 38ae2398c22d88895d5f7293d5536d21e184ba59
Author: Jo-Philipp Wich <jow@openwrt.org>
Date:   Tue, 17 Feb 2015 12:54:34 +0100

Merge pull request #915 from Zokormazo/grep

grep: Fix CVE-2015-1345 heap buffer overrun
Diffstat:
M
utils/grep/Makefile
 | 
2
+-
A
utils/grep/patches/0001-grep-F-fix-a-heap-buffer-read-overrun.patch
 | 
15
+++++++++++++++

2 files changed, 16 insertions(+), 1 deletion(-)
diff --git 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
diff --git 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