Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fae4528b authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Eric Van Hensbergen
Browse files

fs/9p: re-init the wstat in readdir loop 



This ensure that on failure when we free the stat buf we don't end up
freeing an already freed pointer in the earlier loop

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarSripathi Kodi <sripathik@in.ibm.com>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent 86c84373

fs/9p/vfs_dir.c

+10 −1
Original line number Diff line number Diff line
@@ -76,6 +76,15 @@ static inline int dt_type(struct p9_wstat *mistat) 
	return rettype;

}



static void p9stat_init(struct p9_wstat *stbuf)

{

	stbuf->name  = NULL;

	stbuf->uid   = NULL;

	stbuf->gid   = NULL;

	stbuf->muid  = NULL;

	stbuf->extension = NULL;

}



/**

 * v9fs_dir_readdir - read a directory

 * @filp: opened file structure
@@ -131,8 +140,8 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir) 
			rdir->head = 0;

			rdir->tail = err;

		}



		while (rdir->head < rdir->tail) {

			p9stat_init(&st);

			err = p9stat_read(rdir->buf + rdir->head,

						buflen - rdir->head, &st,

						fid->clnt->proto_version);