From 00a8e7813decb4339ef45a34cecdc09c4be3dd70 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 12 Oct 2009 01:32:44 +0200 Subject: Make rename("something", "something/.") not hang * libdiskfs/dir-rename.c: Include (diskfs_S_dir_rename): If source or destination ends with "." or "..", return EINVAL as required by POSIX. --- libdiskfs/dir-rename.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libdiskfs/dir-rename.c') diff --git a/libdiskfs/dir-rename.c b/libdiskfs/dir-rename.c index 747c6666..867e395d 100644 --- a/libdiskfs/dir-rename.c +++ b/libdiskfs/dir-rename.c @@ -19,6 +19,7 @@ #include "priv.h" #include "fs_S.h" +#include /* To avoid races in checkpath, and to prevent a directory from being simultaneously renamed by two processes, we serialize all renames of @@ -44,6 +45,10 @@ diskfs_S_dir_rename (struct protid *fromcred, if (! tocred) return EXDEV; + if (!strcmp (fromname, ".") || !strcmp (fromname, "..") + || !strcmp (toname, ".") || !strcmp (toname, "..")) + return EINVAL; + if (tocred->po->shadow_root != fromcred->po->shadow_root) /* Same translator, but in different shadow trees. */ return EXDEV; -- cgit v1.2.3