diff mbox

btrfs restore memory corruption (bug: 82701)

Message ID 1408614736.11298.6.camel@localhost.localdomain (mailing list archive)
State New, archived
Headers show

Commit Message

Gui Hecheng Aug. 21, 2014, 9:52 a.m. UTC
On Mon, 2014-08-18 at 11:25 +0200, Marc Dietrich wrote:
> Hi,
> 
> I did a checkout of the latest btrfs progs to repair my damaged filesystem. 
> Running btrfs restore gives me several failed to inflate: -6 and crashes with 
> some memory corruption. I ran it again with valgrind and got:
> 
> valgrind --log-file=x2 -v --leak-check=yes btrfs restore /dev/sda9 /mnt/backup
> 
> ==8528== Memcheck, a memory error detector
> ==8528== Copyright (C) 2002-2012, and GNU GPL'd, by Julian Seward et al.
> ==8528== Using Valgrind-3.8.1 and LibVEX; rerun with -h for copyright info
> ==8528== Command: btrfs restore /dev/sda9 /mnt/backup
> ==8528== Parent PID: 8453
> ==8528== 
> ==8528== Syscall param pwrite64(buf) points to uninitialised byte(s)
> ==8528==    at 0x59BE3C3: __pwrite_nocancel (in /lib64/libpthread-2.18.so)
> ==8528==    by 0x41F22F: search_dir (cmds-restore.c:392)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> ==8528==    by 0x4043FE: main (btrfs.c:286)
> ==8528==  Address 0x66956a0 is 7,056 bytes inside a block of size 8,192 
> alloc'd
> ==8528==    at 0x4C277AB: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-
> amd64-linux.so)
> ==8528==    by 0x41EEAD: search_dir (cmds-restore.c:316)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> ==8528==    by 0x4043FE: main (btrfs.c:286)
-------------------[snip]---------------------------------
> ==8528== Invalid read of size 1
> ==8528==    at 0x4C2BF15: memcpy@@GLIBC_2.14 (in 
> /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==8528==    by 0x43818F: read_extent_buffer (string3.h:51)
> ==8528==    by 0x41EC66: search_dir (cmds-restore.c:233)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> ==8528==    by 0x4043FE: main (btrfs.c:286)
> ==8528==  Address 0x684c186 is 1,110 bytes inside a block of size 4,224 free'd
> ==8528==    at 0x4C28ADC: free (in /usr/lib64/valgrind/vgpreload_memcheck-
> amd64-linux.so)
> ==8528==    by 0x437895: free_extent_buffer (extent_io.c:618)
> ==8528==    by 0x41E053: next_leaf (cmds-restore.c:202)
> ==8528==    by 0x41E50F: search_dir (cmds-restore.c:731)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> ==8528==    by 0x4043FE: main (btrfs.c:286)
> ==8528== 
> ==8528== Invalid read of size 8
> ==8528==    at 0x4C2BF40: memcpy@@GLIBC_2.14 (in 
> /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==8528==    by 0x43818F: read_extent_buffer (string3.h:51)
> ==8528==    by 0x41EC66: search_dir (cmds-restore.c:233)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> ==8528==    by 0x4043FE: main (btrfs.c:286)
> ==8528==  Address 0x684c178 is 1,096 bytes inside a block of size 4,224 free'd
> ==8528==    at 0x4C28ADC: free (in /usr/lib64/valgrind/vgpreload_memcheck-
> amd64-linux.so)
> ==8528==    by 0x437895: free_extent_buffer (extent_io.c:618)
> ==8528==    by 0x41E053: next_leaf (cmds-restore.c:202)
> ==8528==    by 0x41E50F: search_dir (cmds-restore.c:731)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> ==8528==    by 0x4043FE: main (btrfs.c:286)
> ==8528== 
> ==8528== Invalid read of size 8
> ==8528==    at 0x4C2BF52: memcpy@@GLIBC_2.14 (in 
> /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==8528==    by 0x43818F: read_extent_buffer (string3.h:51)
> ==8528==    by 0x41EC66: search_dir (cmds-restore.c:233)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> ==8528==    by 0x4043FE: main (btrfs.c:286)
> ==8528==  Address 0x684c168 is 1,080 bytes inside a block of size 4,224 free'd
> ==8528==    at 0x4C28ADC: free (in /usr/lib64/valgrind/vgpreload_memcheck-
> amd64-linux.so)
> ==8528==    by 0x437895: free_extent_buffer (extent_io.c:618)
> ==8528==    by 0x41E053: next_leaf (cmds-restore.c:202)
> ==8528==    by 0x41E50F: search_dir (cmds-restore.c:731)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> ==8528==    by 0x4043FE: main (btrfs.c:286)
> ==8528== 
> ==8528== Invalid read of size 1
> ==8528==    at 0x4C2BFE4: memcpy@@GLIBC_2.14 (in 
> /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==8528==    by 0x43818F: read_extent_buffer (string3.h:51)
> ==8528==    by 0x41EC66: search_dir (cmds-restore.c:233)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> ==8528==    by 0x4043FE: main (btrfs.c:286)
> ==8528==  Address 0x6a385f8 is 2,680 bytes inside a block of size 4,224 free'd
> ==8528==    at 0x4C28ADC: free (in /usr/lib64/valgrind/vgpreload_memcheck-
> amd64-linux.so)
> ==8528==    by 0x437895: free_extent_buffer (extent_io.c:618)
> ==8528==    by 0x41E053: next_leaf (cmds-restore.c:202)
> ==8528==    by 0x41E50F: search_dir (cmds-restore.c:731)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> ==8528==    by 0x4043FE: main (btrfs.c:286)
> ==8528== 
----------------------------------------------------------
For the above piece,
maybe you would like to try if the following helps or not:


it doesn't seems to go the right way when entering the next level,
it should starts at the first slot at least.

-Gui

> ==8528== Invalid read of size 2
> ==8528==    at 0x4C2BFA0: memcpy@@GLIBC_2.14 (in 
> /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==8528==    by 0x43818F: read_extent_buffer (string3.h:51)
> ==8528==    by 0x41EC66: search_dir (cmds-restore.c:233)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> ==8528==    by 0x4043FE: main (btrfs.c:286)
> ==8528==  Address 0x6b0bfb8 is 632 bytes inside a block of size 4,224 free'd
> ==8528==    at 0x4C28ADC: free (in /usr/lib64/valgrind/vgpreload_memcheck-
> amd64-linux.so)
> ==8528==    by 0x437895: free_extent_buffer (extent_io.c:618)
> ==8528==    by 0x4261CA: btrfs_release_path (ctree.c:61)
> ==8528==    by 0x426212: btrfs_free_path (ctree.c:51)
> ==8528==    by 0x41F93B: search_dir (cmds-restore.c:911)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528== 
> ==8528== Invalid read of size 2
> ==8528==    at 0x4C2BFB3: memcpy@@GLIBC_2.14 (in 
> /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==8528==    by 0x43818F: read_extent_buffer (string3.h:51)
> ==8528==    by 0x41EC66: search_dir (cmds-restore.c:233)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> ==8528==    by 0x4043FE: main (btrfs.c:286)
> ==8528==  Address 0x6b0bfb4 is 628 bytes inside a block of size 4,224 free'd
> ==8528==    at 0x4C28ADC: free (in /usr/lib64/valgrind/vgpreload_memcheck-
> amd64-linux.so)
> ==8528==    by 0x437895: free_extent_buffer (extent_io.c:618)
> ==8528==    by 0x4261CA: btrfs_release_path (ctree.c:61)
> ==8528==    by 0x426212: btrfs_free_path (ctree.c:51)
> ==8528==    by 0x41F93B: search_dir (cmds-restore.c:911)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> ==8528== 
> ==8528== 
> ==8528== HEAP SUMMARY:
> ==8528==     in use at exit: 0 bytes in 0 blocks
> ==8528==   total heap usage: 260,452 allocs, 260,452 frees, 278,189,550 bytes 
> allocated
> ==8528== 
> ==8528== All heap blocks were freed -- no leaks are possible
> ==8528== 
> ==8528== For counts of detected and suppressed errors, rerun with: -v
> ==8528== Use --track-origins=yes to see where uninitialised values come from
> ==8528== ERROR SUMMARY: 16597 errors from 7 contexts (suppressed: 2 from 2)
> 
> see: https://bugzilla.kernel.org/show_bug.cgi?id=82701
> 
> Marc
> 
> p.s.
> 
> I wonder if this list should be autosubscribed to btrfs related bugs
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Marc Dietrich Aug. 21, 2014, 2:19 p.m. UTC | #1
Am Donnerstag, 21. August 2014, 17:52:16 schrieb Gui Hecheng:
> On Mon, 2014-08-18 at 11:25 +0200, Marc Dietrich wrote:
> > Hi,
> > 
> > I did a checkout of the latest btrfs progs to repair my damaged
> > filesystem.
> > Running btrfs restore gives me several failed to inflate: -6 and crashes
> > with some memory corruption. I ran it again with valgrind and got:
> > 
> > valgrind --log-file=x2 -v --leak-check=yes btrfs restore /dev/sda9
> > /mnt/backup
> > 
> > ==8528== Memcheck, a memory error detector
> > ==8528== Copyright (C) 2002-2012, and GNU GPL'd, by Julian Seward et al.
> > ==8528== Using Valgrind-3.8.1 and LibVEX; rerun with -h for copyright info
> > ==8528== Command: btrfs restore /dev/sda9 /mnt/backup
> > ==8528== Parent PID: 8453
> > ==8528==
> > ==8528== Syscall param pwrite64(buf) points to uninitialised byte(s)
> > ==8528==    at 0x59BE3C3: __pwrite_nocancel (in /lib64/libpthread-2.18.so)
> > ==8528==    by 0x41F22F: search_dir (cmds-restore.c:392)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> > ==8528==    by 0x4043FE: main (btrfs.c:286)
> > ==8528==  Address 0x66956a0 is 7,056 bytes inside a block of size 8,192
> > alloc'd
> > ==8528==    at 0x4C277AB: malloc (in
> > /usr/lib64/valgrind/vgpreload_memcheck- amd64-linux.so)
> > ==8528==    by 0x41EEAD: search_dir (cmds-restore.c:316)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> > ==8528==    by 0x4043FE: main (btrfs.c:286)
> 
> -------------------[snip]---------------------------------
> 
> > ==8528== Invalid read of size 1
> > ==8528==    at 0x4C2BF15: memcpy@@GLIBC_2.14 (in
> > /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> > ==8528==    by 0x43818F: read_extent_buffer (string3.h:51)
> > ==8528==    by 0x41EC66: search_dir (cmds-restore.c:233)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> > ==8528==    by 0x4043FE: main (btrfs.c:286)
> > ==8528==  Address 0x684c186 is 1,110 bytes inside a block of size 4,224
> > free'd ==8528==    at 0x4C28ADC: free (in
> > /usr/lib64/valgrind/vgpreload_memcheck- amd64-linux.so)
> > ==8528==    by 0x437895: free_extent_buffer (extent_io.c:618)
> > ==8528==    by 0x41E053: next_leaf (cmds-restore.c:202)
> > ==8528==    by 0x41E50F: search_dir (cmds-restore.c:731)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> > ==8528==    by 0x4043FE: main (btrfs.c:286)
> > ==8528==
> > ==8528== Invalid read of size 8
> > ==8528==    at 0x4C2BF40: memcpy@@GLIBC_2.14 (in
> > /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> > ==8528==    by 0x43818F: read_extent_buffer (string3.h:51)
> > ==8528==    by 0x41EC66: search_dir (cmds-restore.c:233)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> > ==8528==    by 0x4043FE: main (btrfs.c:286)
> > ==8528==  Address 0x684c178 is 1,096 bytes inside a block of size 4,224
> > free'd ==8528==    at 0x4C28ADC: free (in
> > /usr/lib64/valgrind/vgpreload_memcheck- amd64-linux.so)
> > ==8528==    by 0x437895: free_extent_buffer (extent_io.c:618)
> > ==8528==    by 0x41E053: next_leaf (cmds-restore.c:202)
> > ==8528==    by 0x41E50F: search_dir (cmds-restore.c:731)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> > ==8528==    by 0x4043FE: main (btrfs.c:286)
> > ==8528==
> > ==8528== Invalid read of size 8
> > ==8528==    at 0x4C2BF52: memcpy@@GLIBC_2.14 (in
> > /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> > ==8528==    by 0x43818F: read_extent_buffer (string3.h:51)
> > ==8528==    by 0x41EC66: search_dir (cmds-restore.c:233)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> > ==8528==    by 0x4043FE: main (btrfs.c:286)
> > ==8528==  Address 0x684c168 is 1,080 bytes inside a block of size 4,224
> > free'd ==8528==    at 0x4C28ADC: free (in
> > /usr/lib64/valgrind/vgpreload_memcheck- amd64-linux.so)
> > ==8528==    by 0x437895: free_extent_buffer (extent_io.c:618)
> > ==8528==    by 0x41E053: next_leaf (cmds-restore.c:202)
> > ==8528==    by 0x41E50F: search_dir (cmds-restore.c:731)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> > ==8528==    by 0x4043FE: main (btrfs.c:286)
> > ==8528==
> > ==8528== Invalid read of size 1
> > ==8528==    at 0x4C2BFE4: memcpy@@GLIBC_2.14 (in
> > /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> > ==8528==    by 0x43818F: read_extent_buffer (string3.h:51)
> > ==8528==    by 0x41EC66: search_dir (cmds-restore.c:233)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> > ==8528==    by 0x4043FE: main (btrfs.c:286)
> > ==8528==  Address 0x6a385f8 is 2,680 bytes inside a block of size 4,224
> > free'd ==8528==    at 0x4C28ADC: free (in
> > /usr/lib64/valgrind/vgpreload_memcheck- amd64-linux.so)
> > ==8528==    by 0x437895: free_extent_buffer (extent_io.c:618)
> > ==8528==    by 0x41E053: next_leaf (cmds-restore.c:202)
> > ==8528==    by 0x41E50F: search_dir (cmds-restore.c:731)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> > ==8528==    by 0x4043FE: main (btrfs.c:286)
> > ==8528==
> 
> ----------------------------------------------------------
> For the above piece,
> maybe you would like to try if the following helps or not:
> 
> diff --git a/cmds-restore.c b/cmds-restore.c
> index 239ea6c..dde7de8 100644
> --- a/cmds-restore.c
> +++ b/cmds-restore.c
> @@ -182,6 +182,7 @@ again:
>                 c = path->nodes[level];
>                 if (slot >= btrfs_header_nritems(c)) {
>                         level++;
> +                       offset = 1;
>                         if (level == BTRFS_MAX_LEVEL)
>                                 return 1;
>                         continue;
> 
> it doesn't seems to go the right way when entering the next level,
> it should starts at the first slot at least.

Can't tell if it's the right thing to do, but at least I haven't seen *this* 
leak message for a while now.

Additionally, I get many of these (unrelated) leaks now:

==3007== Invalid read of size 1
==3007==    at 0x57A11B1: lzo1x_decompress_safe (in 
/usr/lib64/liblzo2.so.2.0.0)
==3007==    by 0x41E2C4: decompress (cmds-restore.c:122)
==3007==    by 0x41F19D: search_dir (cmds-restore.c:378)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==  Address 0x6887774 is 4 bytes after a block of size 4,096 alloc'd
==3007==    at 0x4C277AB: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-
amd64-linux.so)
==3007==    by 0x41EE61: search_dir (cmds-restore.c:309)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)
==3007==    by 0x41F8D7: search_dir (cmds-restore.c:895)

Thanks so far!

Marc


> > ==8528== Invalid read of size 2
> > ==8528==    at 0x4C2BFA0: memcpy@@GLIBC_2.14 (in
> > /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> > ==8528==    by 0x43818F: read_extent_buffer (string3.h:51)
> > ==8528==    by 0x41EC66: search_dir (cmds-restore.c:233)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> > ==8528==    by 0x4043FE: main (btrfs.c:286)
> > ==8528==  Address 0x6b0bfb8 is 632 bytes inside a block of size 4,224
> > free'd ==8528==    at 0x4C28ADC: free (in
> > /usr/lib64/valgrind/vgpreload_memcheck- amd64-linux.so)
> > ==8528==    by 0x437895: free_extent_buffer (extent_io.c:618)
> > ==8528==    by 0x4261CA: btrfs_release_path (ctree.c:61)
> > ==8528==    by 0x426212: btrfs_free_path (ctree.c:51)
> > ==8528==    by 0x41F93B: search_dir (cmds-restore.c:911)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==
> > ==8528== Invalid read of size 2
> > ==8528==    at 0x4C2BFB3: memcpy@@GLIBC_2.14 (in
> > /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> > ==8528==    by 0x43818F: read_extent_buffer (string3.h:51)
> > ==8528==    by 0x41EC66: search_dir (cmds-restore.c:233)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x4204B8: cmd_restore (cmds-restore.c:1284)
> > ==8528==    by 0x4043FE: main (btrfs.c:286)
> > ==8528==  Address 0x6b0bfb4 is 628 bytes inside a block of size 4,224
> > free'd ==8528==    at 0x4C28ADC: free (in
> > /usr/lib64/valgrind/vgpreload_memcheck- amd64-linux.so)
> > ==8528==    by 0x437895: free_extent_buffer (extent_io.c:618)
> > ==8528==    by 0x4261CA: btrfs_release_path (ctree.c:61)
> > ==8528==    by 0x426212: btrfs_free_path (ctree.c:51)
> > ==8528==    by 0x41F93B: search_dir (cmds-restore.c:911)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==    by 0x41F8D0: search_dir (cmds-restore.c:895)
> > ==8528==
> > ==8528==
> > ==8528== HEAP SUMMARY:
> > ==8528==     in use at exit: 0 bytes in 0 blocks
> > ==8528==   total heap usage: 260,452 allocs, 260,452 frees, 278,189,550
> > bytes allocated
> > ==8528==
> > ==8528== All heap blocks were freed -- no leaks are possible
> > ==8528==
> > ==8528== For counts of detected and suppressed errors, rerun with: -v
> > ==8528== Use --track-origins=yes to see where uninitialised values come
> > from ==8528== ERROR SUMMARY: 16597 errors from 7 contexts (suppressed: 2
> > from 2)
> > 
> > see: https://bugzilla.kernel.org/show_bug.cgi?id=82701
> > 
> > Marc
> > 
> > p.s.
> > 
> > I wonder if this list should be autosubscribed to btrfs related bugs
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/cmds-restore.c b/cmds-restore.c
index 239ea6c..dde7de8 100644
--- a/cmds-restore.c
+++ b/cmds-restore.c
@@ -182,6 +182,7 @@  again:
                c = path->nodes[level];
                if (slot >= btrfs_header_nritems(c)) {
                        level++;
+                       offset = 1;
                        if (level == BTRFS_MAX_LEVEL)
                                return 1;
                        continue;