[PATCH] f2fs crypto: fix to release buffer for fname crypto

[Chao Yu]

This patch fixes memory leak issue in error path of f2fs_fname_setup_filename().

Signed-off-by: Chao Yu <chao2...@samsung.com>
---
 fs/f2fs/crypto_fname.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/f2fs/crypto_fname.c b/fs/f2fs/crypto_fname.c
index e3a1bdc..016c4b6 100644
--- a/fs/f2fs/crypto_fname.c
+++ b/fs/f2fs/crypto_fname.c
@@ -425,7 +425,7 @@ int f2fs_fname_setup_filename(struct inode *dir, const 
struct qstr *iname,
        if (!f2fs_encrypted_inode(dir) || is_dot_dotdot(iname)) {
                fname->disk_name.name = (unsigned char *)iname->name;
                fname->disk_name.len = iname->len;
-               goto out;
+               return 0;
        }
        ret = f2fs_setup_fname_crypto(dir);
        if (ret)
@@ -435,14 +435,13 @@ int f2fs_fname_setup_filename(struct inode *dir, const 
struct qstr *iname,
                ret = f2fs_fname_crypto_alloc_buffer(dir, iname->len,
                                                     &fname->crypto_buf);
                if (ret < 0)
-                       goto out;
+                       return ret;
                ret = f2fs_fname_encrypt(dir, iname, &fname->crypto_buf);
                if (ret < 0)
                        goto out;
                fname->disk_name.name = fname->crypto_buf.name;
                fname->disk_name.len = fname->crypto_buf.len;
-               ret = 0;
-               goto out;
+               return 0;
        }
        if (!lookup) {
                ret = -EACCES;
@@ -476,8 +475,9 @@ int f2fs_fname_setup_filename(struct inode *dir, const 
struct qstr *iname,
                fname->disk_name.name = fname->crypto_buf.name;
                fname->disk_name.len = fname->crypto_buf.len;
        }
-       ret = 0;
+       return 0;
 out:
+       f2fs_fname_crypto_free_buffer(&fname->crypto_buf);
        return ret;
 }
 
-- 
2.3.3


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/