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

Commit 62b2be59 authored by Latchesar Ionkov's avatar Latchesar Ionkov Committed by Eric Van Hensbergen
Browse files

fs/9p, net/9p: memory leak fixes 



Four memory leak fixes in the 9P code.

Signed-off-by: default avatarLatchesar Ionkov <lucho@ionkov.net>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent 49553c2e

fs/9p/vfs_inode.c

+2 −0
Original line number Diff line number Diff line
@@ -1128,6 +1128,7 @@ v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, 
	v9fs_stat2inode(st, dentry->d_inode, dentry->d_inode->i_sb);

		generic_fillattr(dentry->d_inode, stat);



	p9stat_free(st);

	kfree(st);

	return 0;

}
@@ -1489,6 +1490,7 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen) 


	retval = strnlen(buffer, buflen);

done:

	p9stat_free(st);

	kfree(st);

	return retval;

}

net/9p/client.c

+6 −1
Original line number Diff line number Diff line
@@ -331,8 +331,10 @@ static void p9_tag_cleanup(struct p9_client *c) 
		}

	}



	if (c->tagpool)

	if (c->tagpool) {

		p9_idpool_put(0, c->tagpool); /* free reserved tag 0 */

		p9_idpool_destroy(c->tagpool);

	}



	/* free requests associated with tags */

	for (row = 0; row < (c->max_tag/P9_ROW_MAXTAG); row++) {
@@ -944,6 +946,7 @@ struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames, 
	int16_t nwqids, count;



	err = 0;

	wqids = NULL;

	clnt = oldfid->clnt;

	if (clone) {

		fid = p9_fid_create(clnt);
@@ -994,9 +997,11 @@ struct p9_fid *p9_client_walk(struct p9_fid *oldfid, int nwname, char **wnames, 
	else

		fid->qid = oldfid->qid;



	kfree(wqids);

	return fid;



clunk_fid:

	kfree(wqids);

	p9_client_clunk(fid);

	fid = NULL;