Skip to contentSkip to conversation

ceph: fix memory leak in mount error path when using test_dummy_encryption

PATCH In review Luís Henriques 2 participants 7 messages Nov 8, 2022 – Nov 9, 2022 Ceph client

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ceph: fix memory leak in mount error path when using test_dummy_encryption

Because ceph_init_fs_context() will never be invoced in case we get a mount error, destroy_mount_options() won't be releasing fscrypt resources with fscrypt_free_dummy_policy(). This will result in a memory leak. Add an invocation to this function in the mount error path.

---
* Changes since v1:

As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to ceph_real_mount().

(Also used 'git format-patch' with '--base' so that the bots know what to (not) do with this patch.)

 fs/ceph/super.c | 1 +
 1 file changed, 1 insertion(+)
fs/ceph/super.c +1 -0
index 2224d44d21c0..f10a076f47e5 100644
@@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc,
 
 out:
 	mutex_unlock(&fsc->client->mount_mutex);
+	ceph_fscrypt_free_dummy_policy(fsc);
 	return ERR_PTR(err);
 }
 

base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be
prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa
prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624
prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e

#1 lore raw
Quoted 31 lines · Luís Henriques

Because ceph_init_fs_context() will never be invoced in case we get a mount error, destroy_mount_options() won't be releasing fscrypt resources with fscrypt_free_dummy_policy(). This will result in a memory leak. Add an invocation to this function in the mount error path.

---
* Changes since v1:

As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to ceph_real_mount().

(Also used 'git format-patch' with '--base' so that the bots know what to (not) do with this patch.)

  fs/ceph/super.c | 1 +
  1 file changed, 1 insertion(+)
fs/ceph/super.c +1 -0
index 2224d44d21c0..f10a076f47e5 100644
@@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc,
 
  out:
  	mutex_unlock(&fsc->client->mount_mutex);
+	ceph_fscrypt_free_dummy_policy(fsc);
  	return ERR_PTR(err);
  }
 
Quoted 5 lines

base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be
prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa
prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624
prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e

LGTM.

Thanks Luis.

Could I fold this into the previous commit ?

BRs

- Xiubo

#2 lore raw
Quoted 38 lines · Xiubo Li
Quoted 29 lines · Luís Henriques

Because ceph_init_fs_context() will never be invoced in case we get a mount error, destroy_mount_options() won't be releasing fscrypt resources with fscrypt_free_dummy_policy(). This will result in a memory leak. Add an invocation to this function in the mount error path.

---
* Changes since v1:

As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to ceph_real_mount().

(Also used 'git format-patch' with '--base' so that the bots know what to (not) do with this patch.)

  fs/ceph/super.c | 1 +
  1 file changed, 1 insertion(+)
fs/ceph/super.c +1 -0
index 2224d44d21c0..f10a076f47e5 100644
@@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc,
  out:
  	mutex_unlock(&fsc->client->mount_mutex);
+	ceph_fscrypt_free_dummy_policy(fsc);
  	return ERR_PTR(err);
  }
 
Quoted 5 lines

base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be
prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa
prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624
prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e

LGTM.

Quoted 3 lines

Thanks Luis.

Could I fold this into the previous commit ?

Yes, sure. I'm fine with that.

Cheers,
--
Luís

#3 lore raw
Quoted 38 lines · Luís Henriques
Quoted 37 lines · Xiubo Li
Quoted 29 lines · Luís Henriques

Because ceph_init_fs_context() will never be invoced in case we get a mount error, destroy_mount_options() won't be releasing fscrypt resources with fscrypt_free_dummy_policy(). This will result in a memory leak. Add an invocation to this function in the mount error path.

---
* Changes since v1:

As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to ceph_real_mount().

(Also used 'git format-patch' with '--base' so that the bots know what to (not) do with this patch.)

   fs/ceph/super.c | 1 +
   1 file changed, 1 insertion(+)
fs/ceph/super.c +1 -0
index 2224d44d21c0..f10a076f47e5 100644
@@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc,
   out:
   	mutex_unlock(&fsc->client->mount_mutex);
+	ceph_fscrypt_free_dummy_policy(fsc);
   	return ERR_PTR(err);
   }
 
Quoted 5 lines

base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be
prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa
prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624
prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e

LGTM.

Quoted 4 lines
Quoted 3 lines

Thanks Luis.

Could I fold this into the previous commit ?

Yes, sure. I'm fine with that.

Thanks.

I will mentioned this fix in that commit comments.

- Xiubo

Quoted 5 lines

Cheers,
--
Luís

#4 lore raw
In reply to Luís Henriques

Hi Luis,

Please check https://github.com/ceph/ceph-client/commit/205efda80b6759a741dde209a7158a5bbf044d23#diff-eb62c69f842ed95a7d047262a62946b07eda52f2ea49ae33c39ea13754dfc291.

Currently I only applied it into the 'testing' branch.

Thanks!

- Xiubo

Quoted 47 lines · Luís Henriques
Quoted 37 lines · Xiubo Li
Quoted 29 lines · Luís Henriques

Because ceph_init_fs_context() will never be invoced in case we get a mount error, destroy_mount_options() won't be releasing fscrypt resources with fscrypt_free_dummy_policy(). This will result in a memory leak. Add an invocation to this function in the mount error path.

---
* Changes since v1:

As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to ceph_real_mount().

(Also used 'git format-patch' with '--base' so that the bots know what to (not) do with this patch.)

   fs/ceph/super.c | 1 +
   1 file changed, 1 insertion(+)
fs/ceph/super.c +1 -0
index 2224d44d21c0..f10a076f47e5 100644
@@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc,
   out:
   	mutex_unlock(&fsc->client->mount_mutex);
+	ceph_fscrypt_free_dummy_policy(fsc);
   	return ERR_PTR(err);
   }
 
Quoted 5 lines

base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be
prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa
prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624
prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e

LGTM.

Quoted 3 lines

Thanks Luis.

Could I fold this into the previous commit ?

Yes, sure. I'm fine with that.

Cheers,
--
Luís

#5 lore raw
Quoted 3 lines · Xiubo Li

Hi Luis,

Please check https://github.com/ceph/ceph-client/commit/205efda80b6759a741dde209a7158a5bbf044d23#diff-eb62c69f842ed95a7d047262a62946b07eda52f2ea49ae33c39ea13754dfc291.

Ugh! That's quite confusing :-)

I did a 'git fetch' and looked into commit 205efda80b67 ("ceph: implement -o test_dummy_encryption mount option") instead, and compared it with it's version in the wip-fscrypt branch. It looks good to me: the only difference I see is my fix (adding the 'ceph_fscrypt_free_dummy_policy' call to 'ceph_real_mount'). Thanks!

Cheers,
--
Luís

Quoted 57 lines

Currently I only applied it into the 'testing' branch.

Thanks!

- Xiubo

Quoted 47 lines · Luís Henriques
Quoted 37 lines · Xiubo Li
Quoted 29 lines · Luís Henriques

Because ceph_init_fs_context() will never be invoced in case we get a mount error, destroy_mount_options() won't be releasing fscrypt resources with fscrypt_free_dummy_policy(). This will result in a memory leak. Add an invocation to this function in the mount error path.

---
* Changes since v1:

As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to ceph_real_mount().

(Also used 'git format-patch' with '--base' so that the bots know what to (not) do with this patch.)

   fs/ceph/super.c | 1 +
   1 file changed, 1 insertion(+)
fs/ceph/super.c +1 -0
index 2224d44d21c0..f10a076f47e5 100644
@@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc,
   out:
   	mutex_unlock(&fsc->client->mount_mutex);
+	ceph_fscrypt_free_dummy_policy(fsc);
   	return ERR_PTR(err);
   }
 
Quoted 5 lines

base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be
prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa
prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624
prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e

LGTM.

Quoted 3 lines

Thanks Luis.

Could I fold this into the previous commit ?

Yes, sure. I'm fine with that.

Cheers,
--
Luís

#6 lore raw
Quoted 11 lines · Luís Henriques
Quoted 3 lines · Xiubo Li

Hi Luis,

Please check https://github.com/ceph/ceph-client/commit/205efda80b6759a741dde209a7158a5bbf044d23#diff-eb62c69f842ed95a7d047262a62946b07eda52f2ea49ae33c39ea13754dfc291.

Ugh! That's quite confusing :-)

I did a 'git fetch' and looked into commit 205efda80b67 ("ceph: implement -o test_dummy_encryption mount option") instead, and compared it with it's version in the wip-fscrypt branch. It looks good to me: the only difference I see is my fix (adding the 'ceph_fscrypt_free_dummy_policy' call to 'ceph_real_mount'). Thanks!

I will update the wip-fscrypt branch later.

Thanks!

Quoted 59 lines

Cheers,
--
Luís

Quoted 55 lines

Currently I only applied it into the 'testing' branch.

Thanks!

- Xiubo

Quoted 47 lines · Luís Henriques
Quoted 37 lines · Xiubo Li
Quoted 29 lines · Luís Henriques

Because ceph_init_fs_context() will never be invoced in case we get a mount error, destroy_mount_options() won't be releasing fscrypt resources with fscrypt_free_dummy_policy(). This will result in a memory leak. Add an invocation to this function in the mount error path.

---
* Changes since v1:

As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to ceph_real_mount().

(Also used 'git format-patch' with '--base' so that the bots know what to (not) do with this patch.)

    fs/ceph/super.c | 1 +
    1 file changed, 1 insertion(+)
fs/ceph/super.c +1 -0
index 2224d44d21c0..f10a076f47e5 100644
@@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc,
    out:
    	mutex_unlock(&fsc->client->mount_mutex);
+	ceph_fscrypt_free_dummy_policy(fsc);
    	return ERR_PTR(err);
    }
 
Quoted 5 lines

base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be
prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa
prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624
prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e

LGTM.

Quoted 3 lines

Thanks Luis.

Could I fold this into the previous commit ?

Yes, sure. I'm fine with that.

Cheers,
--
Luís