diff mbox series

[v2] expand: Check d_type in expmeta before recursing

Message ID ZmPTPb1C0hZYZQPE@gondor.apana.org.au (mailing list archive)
State Accepted
Delegated to: Herbert Xu
Headers show
Series [v2] expand: Check d_type in expmeta before recursing | expand

Commit Message

Herbert Xu June 8, 2024, 3:42 a.m. UTC 
On Tue, Jun 04, 2024 at 11:28:35PM +0200, Jilles Tjoelker wrote:
>
> Good idea, but DT_UNKNOWN might also be a directory or a symlink to one.

Thanks for catching this!

---8<---
If the directory pointer is not a directory, a symlink or an unknown
entity, do not recurse into expmeta.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
 src/expand.c | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/src/expand.c b/src/expand.c
index 345c498..6912e39 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -1722,6 +1722,9 @@  static char *expmeta(char *name, unsigned name_len, size_t expdir_len)
 
 		if (*dname == '.' && !matchdot)
 			goto check_int;
+		if (c && dp->d_type != DT_DIR && dp->d_type != DT_LNK &&
+		    dp->d_type != DT_UNKNOWN)
+			goto check_int;
 		len = strlen(dname) + 1;
 		p = dname;
 		if (!FNMATCH_IS_ENABLED) {