fs/9p: TREADLINK bugfix
Subsystems (2)
PATCH v4 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
Signed-off-by M. Mohan Kumar <[email protected]>
Reported-by Dr. David Alan Gilbert <[email protected]>
---
Changes from previous version:
* Proper error handling and freeing of memory
* Use __getname in v9fs_vfs_follow_link_dotl
* Remove v9fs_vfs_readlink_dotl function
fs/9p/vfs_inode.c | 58 ++++++++++++++++++++-------------------------------- 1 files changed, 22 insertions(+), 36 deletions(-)
fs/9p/vfs_inode.c +22 -36
@@ -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,33 @@ 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) +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 ; + goto ndset; + } + fid =v9fs_fid_lookup (dentry); +if (IS_ERR (fid)) { +__putname (link); + link =ERR_PTR (fid); + goto ndset; } + retval =p9_client_readlink (fid, &target); +if (!retval) { +strcpy (link, target); +kfree (target); + goto ndset; + } +__putname (link); + link =ERR_PTR (retval); +ndset:nd_set_link (nd, link); -return NULL ; }
@@ -2117,7 +2103,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
Quoted 5 lines · M. Mohan Kumar
Remove
v9fs_vfs_readlink_dotlfunction and usegeneric_readlink. Updatev9fs_vfs_follow_link_dotlfunction to accommodate this changeSigned-off-by M. Mohan Kumar <[email protected]>Reported-by Dr. David Alan Gilbert <[email protected]>
Reviewed-by Aneesh Kumar K.V <[email protected]>
Quoted 101 lines
---
Changes from previous version:
* Proper error handling and freeing of memory
* Use__getnameinv9fs_vfs_follow_link_dotl
* Removev9fs_vfs_readlink_dotlfunctionfs/9p/vfs_inode.c | 58 ++++++++++++++++++++-------------------------------- 1 files changed, 22 insertions(+), 36 deletions(-)fs/9p/vfs_inode.c +22
-36@@ -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,33 @@ 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) +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 ; + goto ndset; + } + fid =v9fs_fid_lookup (dentry); +if (IS_ERR (fid)) { +__putname (link); + link =ERR_PTR (fid); + goto ndset; } + retval =p9_client_readlink (fid, &target); +if (!retval) { +strcpy (link, target); +kfree (target); + goto ndset; + } +__putname (link); + link =ERR_PTR (retval); +ndset:nd_set_link (nd, link); -return NULL ; }@@ -2117,7 +2103,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