Skip to contentSkip to conversation

ceph: avoid putting the realm twice when decoding snaps fails

PATCH Superseded [email protected] 2 participants 3 messages Nov 8, 2022

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ceph: avoid putting the realm twice when decoding snaps fails

From: Xiubo Li <[email protected]>

When decoding the snaps fails it maybe leaving the 'first_realm' and 'realm' pointing to the same snaprealm memory. And then it'll put it twice and could cause random use-after-free, BUG_ON, etc issues.

Cc: [email protected]
URL: https://tracker.ceph.com/issues/57686

---
 fs/ceph/snap.c | 2 ++
 1 file changed, 2 insertions(+)
fs/ceph/snap.c +2 -0
index 9bceed2ebda3..77b948846d4d 100644
@@ -854,6 +854,8 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc,
 	else
 		ceph_put_snap_realm(mdsc, realm);
 
+	realm = NULL;
+
 	if (p < e)
 		goto more;
 
Signature · 1 line
2.31.1
maintainer
#1 lore raw
Quoted 21 lines · On Tue, Nov 8, 2022 at 3:32 AM <[email protected]> wrote:

From: Xiubo Li <[email protected]>

When decoding the snaps fails it maybe leaving the 'first_realm' and 'realm' pointing to the same snaprealm memory. And then it'll put it twice and could cause random use-after-free, BUG_ON, etc issues.

Cc: [email protected]
URL: https://tracker.ceph.com/issues/57686

---
 fs/ceph/snap.c | 2 ++
 1 file changed, 2 insertions(+)
fs/ceph/snap.c +0 -0
index 9bceed2ebda3..77b948846d4d 100644

fs/ceph/snap.c int ceph_update_snap_trace(struct ceph_mds_client *mdsc, · line 857

Quoted 4 lines
fs/ceph/snap.c +1 -0
@@ -854,6 +854,8 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc,
        else
                ceph_put_snap_realm(mdsc, realm);
 
+       realm = NULL;

Hi Xiubo,

Nit: I think it would be better to clear realm in the part of the function that actually needs it to be cleared -- otherwise this assignment can be easily lost in refactoring.

        dout("%s deletion=%d\n", __func__, deletion);
more:
        realm = NULL;
        rebuild_snapcs = 0;

And then realm wouldn't need to be initialized.

Thanks,

Ilya

author
#2 lore raw
Quoted 31 lines · Ilya Dryomov
Quoted 20 lines · On Tue, Nov 8, 2022 at 3:32 AM <[email protected]> wrote:

From: Xiubo Li <[email protected]>

When decoding the snaps fails it maybe leaving the 'first_realm' and 'realm' pointing to the same snaprealm memory. And then it'll put it twice and could cause random use-after-free, BUG_ON, etc issues.

Cc: [email protected]
URL: https://tracker.ceph.com/issues/57686

---
  fs/ceph/snap.c | 2 ++
  1 file changed, 2 insertions(+)
fs/ceph/snap.c +0 -0
index 9bceed2ebda3..77b948846d4d 100644

fs/ceph/snap.c int ceph_update_snap_trace(struct ceph_mds_client *mdsc, · line 857

Quoted 4 lines
fs/ceph/snap.c +1 -0
@@ -854,6 +854,8 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc,
         else
                 ceph_put_snap_realm(mdsc, realm);
 
+       realm = NULL;

Hi Xiubo,

Nit: I think it would be better to clear realm in the part of the function that actually needs it to be cleared -- otherwise this assignment can be easily lost in refactoring.

Quoted 6 lines
         dout("%s deletion=%d\n", __func__, deletion);
more:
         realm = NULL;
         rebuild_snapcs = 0;

And then realm wouldn't need to be initialized.

Okay, will fix it.

Thanks!

- Xiubo

Quoted 5 lines

Thanks,

Ilya