diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2005-03-09 06:53:02 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2005-03-09 06:53:02 +0000 |
| commit | e1488c530f8a299261cdd0bf823add08317ccb79 (patch) | |
| tree | 4ab29777e7538578448c6286e6f6a34fb6800377 /ftp/wget | |
| parent | Add a dependency to x11-fonts/texcm-ttf when built with Qt / Xft: (diff) | |
Fix directory traversal vulnerability.
Security: CAN-2004-1487
Security: http://vuxml.FreeBSD.org/06f142ff-4df3-11d9-a9e7-0001020eed82.html
(part of)
Obtained from: SuSE
Approved by: sf (maintainer), erwin (mentor)
Notes
Notes:
svn path=/head/; revision=130684
Diffstat (limited to 'ftp/wget')
| -rw-r--r-- | ftp/wget/Makefile | 2 | ||||
| -rw-r--r-- | ftp/wget/files/patch-CAN-2004-1487 | 51 |
2 files changed, 52 insertions, 1 deletions
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile index 18f1bbec4475..b99e64b12742 100644 --- a/ftp/wget/Makefile +++ b/ftp/wget/Makefile @@ -10,7 +10,7 @@ PORTNAME= wget PORTVERSION= 1.8.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= ftp www ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= wget diff --git a/ftp/wget/files/patch-CAN-2004-1487 b/ftp/wget/files/patch-CAN-2004-1487 new file mode 100644 index 000000000000..d37947a1c88f --- /dev/null +++ b/ftp/wget/files/patch-CAN-2004-1487 @@ -0,0 +1,51 @@ +diff -ruN wget-LFS-20040909/src/http.c wget-LFS-20040909.patched/src/http.c +--- src/http.c.orig 2004-09-09 19:28:26.000000000 -0700 ++++ src/http.c 2005-02-21 04:13:05.000000000 -0800 +@@ -1719,6 +1719,7 @@ + /* Open the local file. */ + if (!output_stream) + { ++ sanitize_path(*hs->local_file); + mkalldirs (*hs->local_file); + if (opt.backups) + rotate_backups (*hs->local_file); +diff -ruN wget-LFS-20040909/src/utils.c wget-LFS-20040909.patched/src/utils.c +--- src/utils.c.orig 2004-09-09 13:32:07.000000000 -0700 ++++ src/utils.c 2005-02-21 04:11:54.000000000 -0800 +@@ -368,6 +368,25 @@ + #endif + } + ++ ++char * ++sanitize_path(char *path) ++{ ++ char *str = NULL; ++ ++ /* evilhost/../ */ ++ while ((str = strstr(path, "..")) != NULL) ++ memcpy(str, "__", 2); ++ /* evilhost/.bashrc */ ++ while ((str = strstr(path, "/.")) != NULL) ++ str[1] = '_'; ++ /* .bashrc */ ++ if (*path == '.') ++ *path = '_'; ++ return path; ++} ++ ++ + /* Returns 0 if PATH is a directory, 1 otherwise (any kind of file). + Returns 0 on error. */ + int +diff -ruN wget-LFS-20040909/src/utils.h wget-LFS-20040909.patched/src/utils.h +--- src/utils.h.orig 2004-09-09 21:05:36.000000000 -0700 ++++ src/utils.h 2005-02-21 04:04:07.000000000 -0800 +@@ -83,6 +83,7 @@ + int make_directory PARAMS ((const char *)); + char *unique_name PARAMS ((const char *, int)); + char *file_merge PARAMS ((const char *, const char *)); ++char *sanitize_path PARAMS ((char *)); + + int acceptable PARAMS ((const char *)); + int accdir PARAMS ((const char *s, enum accd)); |