diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2022-07-10 23:49:07 -0600 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2022-07-11 00:44:30 -0600 |
commit | ad9ac6d07ce1819260c2b7f090fd4fe742c80d9f (patch) | |
tree | ab6a607ea8575382c978f07de943ccf6c077de7c /lib/btrfs/btrfsitem/item_inoderef.go | |
parent | 41ef03aabf8d6db4f926480fc5ddfec014e342d3 (diff) |
Fuzz btrfsitem, and by consequence improve binstruct errors
Diffstat (limited to 'lib/btrfs/btrfsitem/item_inoderef.go')
-rw-r--r-- | lib/btrfs/btrfsitem/item_inoderef.go | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/btrfs/btrfsitem/item_inoderef.go b/lib/btrfs/btrfsitem/item_inoderef.go index e4edf4a..b1eaf1b 100644 --- a/lib/btrfs/btrfsitem/item_inoderef.go +++ b/lib/btrfs/btrfsitem/item_inoderef.go @@ -5,7 +5,10 @@ package btrfsitem import ( + "fmt" + "git.lukeshu.com/btrfs-progs-ng/lib/binstruct" + "git.lukeshu.com/btrfs-progs-ng/lib/binstruct/binutil" ) // key.objectid = inode number of the file @@ -18,10 +21,20 @@ type InodeRef struct { // INODE_REF=12 } func (o *InodeRef) UnmarshalBinary(dat []byte) (int, error) { + if err := binutil.NeedNBytes(dat, 0xA); err != nil { + return 0, err + } n, err := binstruct.UnmarshalWithoutInterface(dat, o) if err != nil { return n, err } + if o.NameLen > MaxNameLen { + return 0, fmt.Errorf("maximum name len is %v, but .NameLen=%v", + MaxNameLen, o.NameLen) + } + if err := binutil.NeedNBytes(dat, 0xA+int(o.NameLen)); err != nil { + return 0, err + } dat = dat[n:] o.Name = dat[:o.NameLen] n += int(o.NameLen) |