aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwxs <wxs@FreeBSD.org>2010-07-23 08:38:55 +0800
committerwxs <wxs@FreeBSD.org>2010-07-23 08:38:55 +0800
commit93155f5b9cf0754423f8e6618f3d96efb0e58388 (patch)
tree82152c5c3d3dc349aa34f8c3697ad4eb830b3b48
parentc1a6ceb6c82f355b12874e833088db34a0836d20 (diff)
downloadfreebsd-ports-gnome-93155f5b9cf0754423f8e6618f3d96efb0e58388.tar.gz
freebsd-ports-gnome-93155f5b9cf0754423f8e6618f3d96efb0e58388.tar.zst
freebsd-ports-gnome-93155f5b9cf0754423f8e6618f3d96efb0e58388.zip
Address buffer overflow vulnerability. This is a patch pulled from upstream
until 1.7.2 is release real soon now. Security: 827bc2b7-95ed-11df-9160-00e0815b8da8
-rw-r--r--devel/git/Makefile1
-rw-r--r--devel/git/files/patch-setup.c11
2 files changed, 12 insertions, 0 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile
index acb9c5054518..e338af48c05a 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -7,6 +7,7 @@
PORTNAME= git
PORTVERSION= 1.7.1.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_KERNEL_ORG}
MASTER_SITE_SUBDIR= software/scm/${PORTNAME}
diff --git a/devel/git/files/patch-setup.c b/devel/git/files/patch-setup.c
new file mode 100644
index 000000000000..c5b46349ff7d
--- /dev/null
+++ b/devel/git/files/patch-setup.c
@@ -0,0 +1,11 @@
+--- ./setup.c.orig 2010-07-22 11:30:51.186311264 -0400
++++ ./setup.c 2010-07-22 11:32:10.173155632 -0400
+@@ -170,6 +170,8 @@
+ char path[PATH_MAX];
+ size_t len = strlen(suspect);
+
++ if (PATH_MAX <= len + strlen("/objects"))
++ die("Too long path: %.*s", 60, suspect);
+ strcpy(path, suspect);
+ if (getenv(DB_ENVIRONMENT)) {
+ if (access(getenv(DB_ENVIRONMENT), X_OK))