Changeset 35854 in vbox

Timestamp:

Feb 4, 2011 3:11:11 PM (14 years ago)

Author:

vboxsync

Message:

Linux Additions / shared folders: fix possible memory leak in error case

File:

• trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c

@@ -23 +23 @@
 static void *sf_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-        struct inode *inode = dentry->d_inode;
-        struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb);
-        struct sf_inode_info *sf_i = GET_INODE_INFO(inode);
-        int error = -ENOMEM;
-        unsigned long page = get_zeroed_page(GFP_KERNEL);
-        int rc;
+    struct inode *inode = dentry->d_inode;
+    struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb);
+    struct sf_inode_info *sf_i = GET_INODE_INFO(inode);
+    int error = -ENOMEM;
+    char *path = (char*)get_zeroed_page(GFP_KERNEL);
+    int rc;
 
-        if (page)
+    if (path)
+    {
+        error = 0;
+        rc = vboxReadLink(&client_handle, &sf_g->map, sf_i->path, PATH_MAX, path);
+        if (RT_FAILURE(rc))
         {
-                error = 0;
-                rc = vboxReadLink(&client_handle, &sf_g->map, sf_i->path, PATH_MAX, (char *)page);
-                if (RT_FAILURE(rc))
-                {
-                        LogFunc(("vboxReadLink failed, caller=%s, rc=%Rrc\n",
-                                 __func__, rc));
-                        error = -EPROTO;
-                }
+            LogFunc(("vboxReadLink failed, caller=%s, rc=%Rrc\n", __func__, rc));
+            free_page((unsigned long)path);
+            error = -EPROTO;
         }
-        nd_set_link(nd, error ? ERR_PTR(error) : (char *)page);
-        return NULL;
+    }
+    nd_set_link(nd, error ? ERR_PTR(error) : path);
+    return NULL;
 }
 
 static void sf_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
 {
-        char *page = nd_get_link(nd);
-        if (!IS_ERR(page))
-                free_page((unsigned long)page);
+    char *page = nd_get_link(nd);
+    if (!IS_ERR(page))
+        free_page((unsigned long)page);
 }
 
 struct inode_operations sf_lnk_iops =
 {
-        .readlink       = generic_readlink,
-        .follow_link    = sf_follow_link,
-        .put_link       = sf_put_link
+    .readlink       = generic_readlink,
+    .follow_link    = sf_follow_link,
+    .put_link       = sf_put_link
 };