Skip to content

B
binwalk
Commit 0b95ff68 by devttys0
Options

Fixed potential self-overlapping signatures

parent 37bb4799
Showing with 30 additions and 24 deletions
src/binwalk/magic/filesystems
...@@ -115,36 +115,42 @@ ...@@ -115,36 +115,42 @@
>12 ubelong !0 {invalid} >12 ubelong !0 {invalid}
>28 string !\x00*12 {invalid} >28 string !\x00*12 {invalid}
0 string UBI\x23 UBI erase count header, #0 string UBI\x23 UBI erase count header,
>4 ubyte x version: %d, #>4 ubyte x version: %d,
>5 string !\x00*3 {invalid} #>5 string !\x00*3 {invalid}
>8 ubequad x EC: 0x%lX, #>8 ubequad x EC: 0x%lX,
>16 ubelong x VID header offset: 0x%X, #>16 ubelong x VID header offset: 0x%X,
>20 ubelong x data offset: 0x%X #>20 ubelong x data offset: 0x%X
# http://lxr.free-electrons.com/source/fs/ubifs/ubifs-media.h # http://lxr.free-electrons.com/source/fs/ubifs/ubifs-media.h
0 lelong 0x06101831 UBIFS master node, #0 lelong 0x06101831 UBIFS master node,
>20 ubyte !7 {invalid} # Only look for the master node #>20 ubyte !7 {invalid} # Only look for the master node
>22 leshort !0 {invalid} #>22 leshort !0 {invalid}
>24 lequad x highest inode: %d, #>24 lequad x highest inode: %d,
>32 lequad x commit number: %d #>32 lequad x commit number: %d
# http://lxr.free-electrons.com/source/fs/ubifs/ubifs-media.h # http://lxr.free-electrons.com/source/fs/ubifs/ubifs-media.h
0 lelong 0x06101831 UBIFS superblock node, 0 lelong 0x06101831 UBIFS
>20 ubyte !6 {invalid} # Only look for the superblock node >20 ubyte <6
>4 ulelong x CRC: 0x%X, >>20 ubyte >7 {invalid} # Only look for superblock and master nodes
>20 ubyte 7 master node,
>>22 leshort !0 {invalid}
>>24 lequad x highest inode: %d,
>>32 lequad x commit number: %d
>20 ubyte 6 superblock node,
>>4 ulelong x CRC: 0x%X,
#>8 lequad x sqnum: %ld, #>8 lequad x sqnum: %ld,
#>16 lelong x node length: %d,{size:%d}{jump:%d} #>16 lelong x node length: %d,{size:%d}{jump:%d}
#>20 ubyte x node type: %d, #>20 ubyte x node type: %d,
#>21 ubyte x group type: %d, #>21 ubyte x group type: %d,
>22 lelong !0 invalid padding,{invalid} >>22 lelong !0 invalid padding,{invalid}
#>26 byte x key hash: 0x%X, #>26 byte x key hash: 0x%X,
#>27 byte x key format: 0x%X, #>27 byte x key format: 0x%X,
>28 lelong x flags: 0x%X, >>28 lelong x flags: 0x%X,
>32 lelong x min I/O unit size: %d, >>32 lelong x min I/O unit size: %d,
>36 lelong x erase block size: %d, >>36 lelong x erase block size: %d,
>40 lelong x erase block count: %d, >>40 lelong x erase block count: %d,
>44 lelong x max erase blocks: %d, >>44 lelong x max erase blocks: %d,
#>48 lelong x maximum data stored in buds: %d, #>48 lelong x maximum data stored in buds: %d,
#>52 lelong x erase block log size: %d, #>52 lelong x erase block log size: %d,
#>56 lelong x LEBs used for lprops table: %d, #>56 lelong x LEBs used for lprops table: %d,
...@@ -152,10 +158,10 @@ ...@@ -152,10 +158,10 @@
#>64 lelong x journal head count: %d, #>64 lelong x journal head count: %d,
#>68 lelong x maximum number of links per indexing node: %d, #>68 lelong x maximum number of links per indexing node: %d,
#>72 lelong x number of LEBs in LPT's save table: %d, #>72 lelong x number of LEBs in LPT's save table: %d,
>76 lelong x format version: %d >>76 lelong x format version: %d
#>80 leshort x default compression type: 0x%X, #>80 leshort x default compression type: 0x%X,
>80 leshort !4 invalid compression,{invalid} >>80 leshort !4 invalid compression,{invalid}
>82 leshort !0 invalid padding,{invalid} >>82 leshort !0 invalid padding,{invalid}
#>84 lelong x reserve pool UID: %d, #>84 lelong x reserve pool UID: %d,
#>88 lelong x reserve pool GID: %d, #>88 lelong x reserve pool GID: %d,
#>92 lequad x reserve pool size: %ld, #>92 lequad x reserve pool size: %ld,
...@@ -163,7 +169,7 @@ ...@@ -163,7 +169,7 @@
#>104 ulequad x UUID: 0x%X #>104 ulequad x UUID: 0x%X
#>112 ulequad x \b%X #>112 ulequad x \b%X
#>120 lelong x UBIFS R/O compatibility version: %d #>120 lelong x UBIFS R/O compatibility version: %d
>124 string !\x00*3968 invalid padding{invalid} >>124 string !\x00*3968 invalid padding{invalid}
# JFFS2 file system # JFFS2 file system
# If used with binwalk's smart signature feature (on by default, -S to disable) # If used with binwalk's smart signature feature (on by default, -S to disable)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment