Skip to contentSkip to conversation

fs/9p: TREADLINK bugfix

PATCH Superseded M. Mohan Kumar 2 participants 4 messages Jan 5, 2011 – Jan 6, 2011

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 fs/9p: TREADLINK bugfix

Remove v9fs_vfs_readlink_dotl function and use generic_readlink. Update v9fs_vfs_follow_link_dotl function to accommodate this change

---
Changes from previous version:
* Use __getname in v9fs_vfs_follow_link_dotl
* Remove v9fs_vfs_readlink_dotl function

 fs/9p/vfs_inode.c |   53 +++++++++++++++++------------------------------------
 1 files changed, 17 insertions(+), 36 deletions(-)
fs/9p/vfs_inode.c +17 -36
index 2ce3668..7e613e8 100644
@@ -1994,30 +1994,6 @@ error:
 	return err;
 }
 
-static int
-v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen)
-{
-	int retval;
-	struct p9_fid *fid;
-	char *target = NULL;
-
-	P9_DPRINTK(P9_DEBUG_VFS, " %s\n", dentry->d_name.name);
-	retval = -EPERM;
-	fid = v9fs_fid_lookup(dentry);
-	if (IS_ERR(fid))
-		return PTR_ERR(fid);
-
-	retval = p9_client_readlink(fid, &target);
-	if (retval < 0)
-		return retval;
-
-	strncpy(buffer, target, buflen);
-	P9_DPRINTK(P9_DEBUG_VFS, "%s -> %s\n", dentry->d_name.name, buffer);
-
-	retval = strnlen(buffer, buflen);
-	return retval;
-}
-
 /**
  * v9fs_vfs_follow_link_dotl - follow a symlink path
  * @dentry: dentry for symlink
@@ -2028,23 +2004,28 @@ v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen)
 static void *
 v9fs_vfs_follow_link_dotl(struct dentry *dentry, struct nameidata *nd)
 {
-	int len = 0;
+	int retval;
+	struct p9_fid *fid;
 	char *link = __getname();
+	char *target;
 
-	P9_DPRINTK(P9_DEBUG_VFS, "%s n", dentry->d_name.name);
+	P9_DPRINTK(P9_DEBUG_VFS, "%s\n", dentry->d_name.name);
 
 	if (!link)
-		link = ERR_PTR(-ENOMEM);
-	else {
-		len = v9fs_vfs_readlink_dotl(dentry, link, PATH_MAX);
-		if (len < 0) {
-			__putname(link);
-			link = ERR_PTR(len);
-		} else
-			link[min(len, PATH_MAX-1)] = 0;
+		return NULL;
+	fid = v9fs_fid_lookup(dentry);
+	if (IS_ERR(fid))
+		return fid;
+	retval = p9_client_readlink(fid, &target);
+	if (retval < 0) {
+		__putname(link);
+		kfree(target);
+		return NULL;
 	}
-	nd_set_link(nd, link);
 
+	strcpy(link, target);
+	nd_set_link(nd, link);
+	kfree(target);
 	return NULL;
 }
 
@@ -2117,7 +2098,7 @@ static const struct inode_operations v9fs_symlink_inode_operations = {
 };
 
 static const struct inode_operations v9fs_symlink_inode_operations_dotl = {
-	.readlink = v9fs_vfs_readlink_dotl,
+	.readlink = generic_readlink,
 	.follow_link = v9fs_vfs_follow_link_dotl,
 	.put_link = v9fs_vfs_put_link,
 	.getattr = v9fs_vfs_getattr_dotl,
Signature · 1 line
1.7.2.3
#1 lore raw
Quoted 61 lines · M. Mohan Kumar

Remove v9fs_vfs_readlink_dotl function and use generic_readlink. Update v9fs_vfs_follow_link_dotl function to accommodate this change

---
Changes from previous version:
* Use __getname in v9fs_vfs_follow_link_dotl
* Remove v9fs_vfs_readlink_dotl function

 fs/9p/vfs_inode.c |   53 +++++++++++++++++------------------------------------
 1 files changed, 17 insertions(+), 36 deletions(-)
fs/9p/vfs_inode.c +4 -26
index 2ce3668..7e613e8 100644
@@ -1994,30 +1994,6 @@ error:
 	return err;
 }
 
-static int
-v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen)
-{
-	int retval;
-	struct p9_fid *fid;
-	char *target = NULL;
-
-	P9_DPRINTK(P9_DEBUG_VFS, " %s\n", dentry->d_name.name);
-	retval = -EPERM;
-	fid = v9fs_fid_lookup(dentry);
-	if (IS_ERR(fid))
-		return PTR_ERR(fid);
-
-	retval = p9_client_readlink(fid, &target);
-	if (retval < 0)
-		return retval;
-
-	strncpy(buffer, target, buflen);
-	P9_DPRINTK(P9_DEBUG_VFS, "%s -> %s\n", dentry->d_name.name, buffer);
-
-	retval = strnlen(buffer, buflen);
-	return retval;
-}
-
 /**
  * v9fs_vfs_follow_link_dotl - follow a symlink path
  * @dentry: dentry for symlink
@@ -2028,23 +2004,28 @@ v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen)
 static void *
 v9fs_vfs_follow_link_dotl(struct dentry *dentry, struct nameidata *nd)
 {
-	int len = 0;
+	int retval;
+	struct p9_fid *fid;
 	char *link = __getname();
+	char *target;
 
-	P9_DPRINTK(P9_DEBUG_VFS, "%s n", dentry->d_name.name);
+	P9_DPRINTK(P9_DEBUG_VFS, "%s\n", dentry->d_name.name);
 

fs/9p/vfs_inode.c v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen) · line 2015

Quoted 10 lines
fs/9p/vfs_inode.c +1 -8
 	if (!link)
-		link = ERR_PTR(-ENOMEM);
-	else {
-		len = v9fs_vfs_readlink_dotl(dentry, link, PATH_MAX);
-		if (len < 0) {
-			__putname(link);
-			link = ERR_PTR(len);
-		} else
-			link[min(len, PATH_MAX-1)] = 0;
+		return NULL;

That should either be return ERR_PTR(-ENOMEM); or link = ERR_PTR(-ENOME) ;nd_set_link(..); return NULL;

fs/9p/vfs_inode.c v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen) · line 2023

Quoted 8 lines
fs/9p/vfs_inode.c +8 -0
+	fid = v9fs_fid_lookup(dentry);
+	if (IS_ERR(fid))
+		return fid;
+	retval = p9_client_readlink(fid, &target);
+	if (retval < 0) {
+		__putname(link);
+		kfree(target);
+		return NULL;

same here either return error or do nd_set_link and return NULL;

Quoted 11 lines
fs/9p/vfs_inode.c +3 -1
 	}
-	nd_set_link(nd, link);
 
+	strcpy(link, target);
+	nd_set_link(nd, link);
+	kfree(target);
 	return NULL;
 }
 

fs/9p/vfs_inode.c static const struct inode_operations v9fs_symlink_inode_operations = { · line 2104

Quoted 8 lines
fs/9p/vfs_inode.c +1 -1
@@ -2117,7 +2098,7 @@ static const struct inode_operations v9fs_symlink_inode_operations = {
 };
 
 static const struct inode_operations v9fs_symlink_inode_operations_dotl = {
-	.readlink = v9fs_vfs_readlink_dotl,
+	.readlink = generic_readlink,
 	.follow_link = v9fs_vfs_follow_link_dotl,
 	.put_link = v9fs_vfs_put_link,
 	.getattr = v9fs_vfs_getattr_dotl,

-aneesh

#2 lore raw
In reply to M. Mohan Kumar
Quoted 64 lines · M. Mohan Kumar

Remove v9fs_vfs_readlink_dotl function and use generic_readlink. Update v9fs_vfs_follow_link_dotl function to accommodate this change

---
Changes from previous version:
* Use __getname in v9fs_vfs_follow_link_dotl
* Remove v9fs_vfs_readlink_dotl function

 fs/9p/vfs_inode.c |   53 +++++++++++++++++------------------------------------
 1 files changed, 17 insertions(+), 36 deletions(-)
fs/9p/vfs_inode.c +4 -28
index 2ce3668..7e613e8 100644
@@ -1994,30 +1994,6 @@ error:
 	return err;
 }
 
-static int
-v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen)
-{
-	int retval;
-	struct p9_fid *fid;
-	char *target = NULL;
-
-	P9_DPRINTK(P9_DEBUG_VFS, " %s\n", dentry->d_name.name);
-	retval = -EPERM;
-	fid = v9fs_fid_lookup(dentry);
-	if (IS_ERR(fid))
-		return PTR_ERR(fid);
-
-	retval = p9_client_readlink(fid, &target);
-	if (retval < 0)
-		return retval;
-
-	strncpy(buffer, target, buflen);
-	P9_DPRINTK(P9_DEBUG_VFS, "%s -> %s\n", dentry->d_name.name, buffer);
-
-	retval = strnlen(buffer, buflen);
-	return retval;
-}
-
 /**
  * v9fs_vfs_follow_link_dotl - follow a symlink path
  * @dentry: dentry for symlink
@@ -2028,23 +2004,28 @@ v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen)
 static void *
 v9fs_vfs_follow_link_dotl(struct dentry *dentry, struct nameidata *nd)
 {
-	int len = 0;
+	int retval;
+	struct p9_fid *fid;
 	char *link = __getname();
+	char *target;
 
-	P9_DPRINTK(P9_DEBUG_VFS, "%s n", dentry->d_name.name);
+	P9_DPRINTK(P9_DEBUG_VFS, "%s\n", dentry->d_name.name);
 
 	if (!link)
-		link = ERR_PTR(-ENOMEM);
-	else {

fs/9p/vfs_inode.c v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen) · line 2018

Quoted 10 lines
fs/9p/vfs_inode.c +4 -6
-		len = v9fs_vfs_readlink_dotl(dentry, link, PATH_MAX);
-		if (len < 0) {
-			__putname(link);
-			link = ERR_PTR(len);
-		} else
-			link[min(len, PATH_MAX-1)] = 0;
+		return NULL;
+	fid = v9fs_fid_lookup(dentry);
+	if (IS_ERR(fid))
+		return fid;

need to do a __putname(link) and do a nd_set_link(nd, ERR_PTR(fid))

fs/9p/vfs_inode.c v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen) · line 2022

Quoted 4 lines
fs/9p/vfs_inode.c +4 -0
+	retval = p9_client_readlink(fid, &target);
+	if (retval < 0) {
+		__putname(link);
+		kfree(target);

On error target should not be allocated right ? So why kfree ?

fs/9p/vfs_inode.c v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen) · line 2031

Quoted 10 lines
fs/9p/vfs_inode.c +4 -1
+		return NULL;
 	}
-	nd_set_link(nd, link);
 
+	strcpy(link, target);
+	nd_set_link(nd, link);
+	kfree(target);
 	return NULL;
 }
 

-aneesh

#3 lore raw

Thanks Aneesh, I will be posting the patch with addressing your comments.

Quoted 1 line · Aneesh Kumar K. V

On Wed, 5 Jan 2011 22:19:56 +0530, "M. Mohan Kumar" <[email protected]>

Quoted 106 lines · wrote:
Quoted 76 lines

Remove v9fs_vfs_readlink_dotl function and use generic_readlink. Update v9fs_vfs_follow_link_dotl function to accommodate this change

---
Changes from previous version:
* Use __getname in v9fs_vfs_follow_link_dotl
* Remove v9fs_vfs_readlink_dotl function

 fs/9p/vfs_inode.c |   53

+++++++++++++++++------------------------------------ 1 files changed, 17 insertions(+), 36 deletions(-)

fs/9p/vfs_inode.c +0 -24
index 2ce3668..7e613e8 100644
@@ -1994,30 +1994,6 @@ error:
 	return err;
 
 }
 
-static int
-v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen)
-{
-	int retval;
-	struct p9_fid *fid;
-	char *target = NULL;
-
-	P9_DPRINTK(P9_DEBUG_VFS, " %s\n", dentry->d_name.name);
-	retval = -EPERM;
-	fid = v9fs_fid_lookup(dentry);
-	if (IS_ERR(fid))
-		return PTR_ERR(fid);
-
-	retval = p9_client_readlink(fid, &target);
-	if (retval < 0)
-		return retval;
-
-	strncpy(buffer, target, buflen);
-	P9_DPRINTK(P9_DEBUG_VFS, "%s -> %s\n", dentry->d_name.name, buffer);
-
-	retval = strnlen(buffer, buflen);
-	return retval;
-}
-
 
 /**

* v9fs_vfs_follow_link_dotl - follow a symlink path
* @dentry: dentry for symlink

fs/9p/vfs_inode.c +4 -4
@@ -2028,23 +2004,28 @@ v9fs_vfs_readlink_dotl(struct dentry *dentry,
 char *buffer, int buflen)
 
 static void *
 v9fs_vfs_follow_link_dotl(struct dentry *dentry, struct nameidata *nd)
 {
 
-	int len = 0;
+	int retval;
+	struct p9_fid *fid;
 
 	char *link = __getname();
 
+	char *target;
 
-	P9_DPRINTK(P9_DEBUG_VFS, "%s n", dentry->d_name.name);
+	P9_DPRINTK(P9_DEBUG_VFS, "%s\n", dentry->d_name.name);
 
 	if (!link)
 
-		link = ERR_PTR(-ENOMEM);
-	else {

fs/9p/vfs_inode.c v9fs_vfs_readlink_dotl(struct dentry *dentry, · line 2024

Quoted 10 lines
fs/9p/vfs_inode.c +4 -6
-		len = v9fs_vfs_readlink_dotl(dentry, link, PATH_MAX);
-		if (len < 0) {
-			__putname(link);
-			link = ERR_PTR(len);
-		} else
-			link[min(len, PATH_MAX-1)] = 0;
+		return NULL;
+	fid = v9fs_fid_lookup(dentry);
+	if (IS_ERR(fid))
+		return fid;

need to do a __putname(link) and do a nd_set_link(nd, ERR_PTR(fid))

fs/9p/vfs_inode.c v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen) · line 2022

Quoted 4 lines
fs/9p/vfs_inode.c +4 -0
+	retval = p9_client_readlink(fid, &target);
+	if (retval < 0) {
+		__putname(link);
+		kfree(target);

On error target should not be allocated right ? So why kfree ?

Quoted 10 lines
fs/9p/vfs_inode.c +4 -1
+		return NULL;
 
 	}
 
-	nd_set_link(nd, link);
 
+	strcpy(link, target);
+	nd_set_link(nd, link);
+	kfree(target);
Quoted 5 lines
Quoted 3 lines

return NULL;

}

-aneesh

----
M. Mohan Kumar