On Tue, Mar 06, 2018 at 02:00:50PM +0100, Carlos Maiolino wrote:
> Signed-off-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
.....
> @@ -275,9 +275,9 @@ newfile(
> d = XFS_FSB_TO_DADDR(mp, map.br_startblock);
> bp = libxfs_trans_get_buf(logit ? tp : 0, mp->m_dev, d,
> nb << mp->m_blkbb_log, 0);
> - memmove(XFS_BUF_PTR(bp), buf, len);
> + memmove(bp->b_addr, buf, len);
> if (len < XFS_BUF_COUNT(bp))
> - memset(XFS_BUF_PTR(bp) + len, 0, XFS_BUF_COUNT(bp) - len);
> + memset(bp->b_addr + len, 0, XFS_BUF_COUNT(bp) - len);
Bug there. pointer arithmetic changed, needs (char *) cast.
> /* OK, now write the superblock... */
> buf = libxfs_getbuf(mp->m_ddev_targp, XFS_SB_DADDR, XFS_FSS_TO_BB(mp, 1));
> buf->b_ops = &xfs_sb_buf_ops;
> - memset(XFS_BUF_PTR(buf), 0, cfg->sectorsize);
> - libxfs_sb_to_disk((void *)XFS_BUF_PTR(buf), sbp);
> + memset(buf->b_addr, 0, cfg->sectorsize);
> + libxfs_sb_to_disk((void *)buf->b_addr, sbp);
Kill the cast - b_addr is already a void *
> @@ -3382,8 +3382,8 @@ initialise_ag_headers(
> XFS_AG_DADDR(mp, agno, XFS_SB_DADDR),
> XFS_FSS_TO_BB(mp, 1));
> buf->b_ops = &xfs_sb_buf_ops;
> - memset(XFS_BUF_PTR(buf), 0, cfg->sectorsize);
> - libxfs_sb_to_disk((void *)XFS_BUF_PTR(buf), sbp);
> + memset(buf->b_addr, 0, cfg->sectorsize);
> + libxfs_sb_to_disk((void *)buf->b_addr, sbp);
ditto.
> +++ b/repair/agheader.c
> @@ -290,8 +290,8 @@ secondary_sb_whack(
> + sizeof(sb->sb_dirblklog);
>
> /* Check the buffer we read from disk for garbage outside size */
> - for (ip = XFS_BUF_PTR(sbuf) + size;
> - ip < XFS_BUF_PTR(sbuf) + mp->m_sb.sb_sectsize;
> + for (ip = sbuf->b_addr + size;
> + ip < (char *)sbuf->b_addr + mp->m_sb.sb_sectsize;
Looks like another pointer math bug there...
> ip++) {
> if (*ip) {
> do_bzero = 1;
> @@ -314,7 +314,7 @@ secondary_sb_whack(
> memcpy(&tmpuuid, &sb->sb_meta_uuid, sizeof(uuid_t));
> memset((void *)((intptr_t)sb + size), 0,
> mp->m_sb.sb_sectsize - size);
> - memset(XFS_BUF_PTR(sbuf) + size, 0,
> + memset(sbuf->b_addr + size, 0,
And another.
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
