Skip to contentSkip to conversation

xfs: log proper length of superblock

PATCH In review Eric Sandeen 4 participants 4 messages Sep 23, 2019 XFS filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs: log proper length of superblock

xfs_trans_log_buf takes first byte, last byte as args. In this case, it should be from 0 to sizeof() - 1.

---

I should have audited everything when I sent the last patch for this type of error. hch suggested changing the interface but it's all pretty grotty and I'm hesitant for now.

I think maybe a new/separate function to take start, len might make sense so that not every caller needs to be munged into a new format, because some of the existing callers would then become more complex...

fs/xfs/libxfs/xfs_sb.c +1 -1
index a08dd8f40346..ac6cdca63e15 100644
@@ -928,7 +928,7 @@ xfs_log_sb(
 
 	xfs_sb_to_disk(XFS_BUF_TO_SBP(bp), &mp->m_sb);
 	xfs_trans_buf_set_type(tp, bp, XFS_BLFT_SB_BUF);
-	xfs_trans_log_buf(tp, bp, 0, sizeof(struct xfs_dsb));
+	xfs_trans_log_buf(tp, bp, 0, sizeof(struct xfs_dsb) - 1);
 }
 
 /*
#1 lore raw
Quoted 4 lines · Eric Sandeen

xfs_trans_log_buf takes first byte, last byte as args. In this case, it should be from 0 to sizeof() - 1.

if you want, you could put a

Fixes 4d11a40239405 ("xfs: remove bitfield based superblock updates")

on this, I guess it was technically a regression in v4.0, even if it has no net effect like last time...

-Eric

Quoted 25 lines

---

I should have audited everything when I sent the last patch for this type of error. hch suggested changing the interface but it's all pretty grotty and I'm hesitant for now.

I think maybe a new/separate function to take start, len might make sense so that not every caller needs to be munged into a new format, because some of the existing callers would then become more complex...

fs/xfs/libxfs/xfs_sb.c +1 -1
index a08dd8f40346..ac6cdca63e15 100644
@@ -928,7 +928,7 @@ xfs_log_sb(
 
 	xfs_sb_to_disk(XFS_BUF_TO_SBP(bp), &mp->m_sb);
 	xfs_trans_buf_set_type(tp, bp, XFS_BLFT_SB_BUF);
-	xfs_trans_log_buf(tp, bp, 0, sizeof(struct xfs_dsb));
+	xfs_trans_log_buf(tp, bp, 0, sizeof(struct xfs_dsb) - 1);
 }
 
 /*
Reviewed-by
#2 lore raw
Quoted 5 lines · Eric Sandeen
Quoted 4 lines · Eric Sandeen

xfs_trans_log_buf takes first byte, last byte as args. In this case, it should be from 0 to sizeof() - 1.

Well spotted!

Quoted 6 lines

if you want, you could put a

Fixes 4d11a40239405 ("xfs: remove bitfield based superblock updates")

on this, I guess it was technically a regression in v4.0, even if it has no net effect like last time...

Yeah, it doesn't expose any issue at all. The buffer logging rounds out to CHUNK_SIZE - 128 bytes - and when we look at the size of the superblock w/ pahole:

struct xfs_dsb {
__be32 sb_magicnum; /* 0 4 */
__be32 sb_blocksize; /* 4 4 */
....

        uuid_t                     sb_meta_uuid;         /*   248    16 */

        /* size: 264, cachelines: 5, members: 55 */
        /* last cacheline: 8 bytes */
};

Well be logging the first three chunks in the sb regardless of whether we pass 263 or 264 as the size of the modified area to xfs_trans_log_buf() (i.e. first 384 bytes of the buffer get logged either way).

So, yeah, the code is wrong, but it does not result in any observable incorrect behaviour. That said, it still needs fixing.

Quoted 19 lines

-Eric

Quoted 17 lines

---

I should have audited everything when I sent the last patch for this type of error. hch suggested changing the interface but it's all pretty grotty and I'm hesitant for now.

I think maybe a new/separate function to take start, len might make sense so that not every caller needs to be munged into a new format, because some of the existing callers would then become more complex...

fs/xfs/libxfs/xfs_sb.c +0 -0
index a08dd8f40346..ac6cdca63e15 100644
@@ -928,7 +928,7 @@ xfs_log_sb(
 
Quoted 7 lines

fs/xfs/libxfs/xfs_sb.c xfs_log_sb( · line 934

Quoted 7 lines
fs/xfs/libxfs/xfs_sb.c +1 -1
 	xfs_sb_to_disk(XFS_BUF_TO_SBP(bp), &mp->m_sb);
 	xfs_trans_buf_set_type(tp, bp, XFS_BLFT_SB_BUF);
-	xfs_trans_log_buf(tp, bp, 0, sizeof(struct xfs_dsb));
+	xfs_trans_log_buf(tp, bp, 0, sizeof(struct xfs_dsb) - 1);
 }
 
 /*

Looks good.

-Dave.

Signature · 2 lines
Dave Chinner
[email protected]
Reviewed-by on v1 1/1
#3 lore raw
In reply to Eric Sandeen
Quoted 4 lines · Eric Sandeen

xfs_trans_log_buf takes first byte, last byte as args. In this case, it should be from 0 to sizeof() - 1.

Looks ok,

--D

Quoted 25 lines

---

I should have audited everything when I sent the last patch for this type of error. hch suggested changing the interface but it's all pretty grotty and I'm hesitant for now.

I think maybe a new/separate function to take start, len might make sense so that not every caller needs to be munged into a new format, because some of the existing callers would then become more complex...

fs/xfs/libxfs/xfs_sb.c +1 -1
index a08dd8f40346..ac6cdca63e15 100644
@@ -928,7 +928,7 @@ xfs_log_sb(
 
 	xfs_sb_to_disk(XFS_BUF_TO_SBP(bp), &mp->m_sb);
 	xfs_trans_buf_set_type(tp, bp, XFS_BLFT_SB_BUF);
-	xfs_trans_log_buf(tp, bp, 0, sizeof(struct xfs_dsb));
+	xfs_trans_log_buf(tp, bp, 0, sizeof(struct xfs_dsb) - 1);
 }
 
 /*