Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LSzNO-0008F5-9R for qemu-devel@nongnu.org; Fri, 30 Jan 2009 14:50:06 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LSzNN-0008EW-IS for qemu-devel@nongnu.org; Fri, 30 Jan 2009 14:50:05 -0500 Received: from [199.232.76.173] (port=48803 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LSzNN-0008EL-CN for qemu-devel@nongnu.org; Fri, 30 Jan 2009 14:50:05 -0500 Received: from hall.aurel32.net ([88.191.82.174]:37810) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LSzNM-0004Ho-Sl for qemu-devel@nongnu.org; Fri, 30 Jan 2009 14:50:05 -0500 Date: Fri, 30 Jan 2009 20:50:03 +0100 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH] linux-user: break recursion loop on symlink to . or .. Message-ID: <20090130195003.GC19283@hall.aurel32.net> References: <20090119153033.GA21176@kos.to> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20090119153033.GA21176@kos.to> Sender: Aurelien Jarno Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Riku Voipio Cc: qemu-devel@nongnu.org On Mon, Jan 19, 2009 at 05:30:33PM +0200, Riku Voipio wrote: > From: Mika Westerberg > > This patch corrects bug in qemu where it contructs its > internal paths and ends up in recursion loop when filesystem > contains symlink that points to dot '.'. > > (Riku: some whitespace fudging to minize diff - the whole > file needs reindenting...) > > Signed-off-by: Riku Voipio Thanks, applied. > --- > linux-user/path.c | 37 ++++++++++++++++++++++++++++++++++++- > 1 files changed, 36 insertions(+), 1 deletions(-) > > diff --git a/linux-user/path.c b/linux-user/path.c > index 06b1f5f..b991af0 100644 > --- a/linux-user/path.c > +++ b/linux-user/path.c > @@ -4,6 +4,7 @@ > The assumption is that this area does not change. > */ > #include > +#include > #include > #include > #include > @@ -52,6 +53,38 @@ static struct pathelem *new_entry(const char *root, > > #define streq(a,b) (strcmp((a), (b)) == 0) > > +/* > + * Checks whether directory entry (dent) is valid. This > + * means that symlinks pointing to '.' and '..' should > + * be skipped by main recursion code. Returns 1 when > + * entry is valid. > + */ > +static int > +is_dentry_valid(const char *path, const struct dirent *dent) > +{ > + char fullpath[PATH_MAX]; > + char linkbuf[PATH_MAX]; > + ssize_t len; > + > + assert(path != NULL); > + assert(dent != NULL); > + > + if (dent->d_type != DT_LNK) > + return (1); > + > + (void) snprintf(fullpath, sizeof (fullpath), "%s/%s", > + path, dent->d_name); > + > + if ((len = readlink(fullpath, linkbuf, sizeof (linkbuf) - 1)) != -1) { > + linkbuf[len] = '\0'; > + if (streq(linkbuf, ".") || streq(linkbuf, "..")) > + return (0); > + } > + > + return (1); > +} > + > +/* TODO: add recursion count check */ > static struct pathelem *add_dir_maybe(struct pathelem *path) > { > DIR *dir; > @@ -61,7 +94,9 @@ static struct pathelem *add_dir_maybe(struct pathelem *path) > > while ((dirent = readdir(dir)) != NULL) { > if (!streq(dirent->d_name,".") && !streq(dirent->d_name,"..")){ > - path = add_entry(path, dirent->d_name); > + if (is_dentry_valid(path->pathname, dirent)) { > + path = add_entry(path, dirent->d_name); > + } > } > } > closedir(dir); > -- > 1.5.6.5 > > > -- > "rm -rf" only sounds scary if you don't have backups > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net