Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement GLOB_LIMIT that limits number of matches to ARG_MAX.

This commit is contained in:
christos 2001-03-16 20:34:08 +00:00
parent cd10ca052b
commit f913546a2e
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libc/gen/__glob13.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: __glob13.c,v 1.14 2000/10/16 04:12:55 erh Exp $ */
/* $NetBSD: __glob13.c,v 1.15 2001/03/16 20:34:08 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
#else
__RCSID("$NetBSD: __glob13.c,v 1.14 2000/10/16 04:12:55 erh Exp $");
__RCSID("$NetBSD: __glob13.c,v 1.15 2001/03/16 20:34:08 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -719,6 +719,11 @@ globextend(path, pglob)
_DIAGASSERT(path != NULL);
_DIAGASSERT(pglob != NULL);
if ((pglob->gl_flags & GLOB_LIMIT) && pglob->gl_pathc >= ARG_MAX) {
errno = 0;
return(GLOB_NOSPACE);
}
newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
pathv = pglob->gl_pathv ?
realloc(pglob->gl_pathv, newsize) :

20
lib/libc/gen/glob.3
View File

@ -1,4 +1,4 @@
.\" $NetBSD: glob.3,v 1.15 1998/06/19 22:53:57 kleink Exp $
.\" $NetBSD: glob.3,v 1.16 2001/03/16 20:34:08 christos Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@ -256,6 +256,13 @@ character for quoting.
Expand patterns that start with
.Ql ~
to user name home directories.
.It Dv GLOB_LIMIT
Limit the number of matches returned to
.Li ARG_MAX
This option should be set for programs that can be coerced to a denial of
service attack via patterns that expand to a very large number of matches,
such as a long string of
.Li */../*/..
.El
.Pp
If, during the search, a directory is encountered that cannot be opened
@ -387,7 +394,13 @@ The pattern does not match any existing pathname, and
was not set int
.Dv flags .
.It Dv GLOB_NOSPACE
An attempt to allocate memory failed.
An attempt to allocate memory failed, or if
.Va errno
was 0
.Li GLOB_LIMIT
was specified in the flags and
.Li ARG_MAX
patterns were matched.
.El
.Pp
The historical
@ -437,8 +450,9 @@ that the flags
.Dv GLOB_BRACE
.Dv GLOB_MAGCHAR,
.Dv GLOB_NOMAGIC,
and
.Dv GLOB_TILDE,
and
.Dv GLOB_LIMIT
and the fields
.Fa gl_matchc
and