Fuzz btrfsitem, and by consequence improve binstruct errors

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/btrfs/btrfsitem/item_rootref.go b/lib/btrfs/btrfsitem/item_rootref.go
index 228ab55..1ee0ee4 100644
--- a/lib/btrfs/btrfsitem/item_rootref.go
+++ b/lib/btrfs/btrfsitem/item_rootref.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"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/internal"
 )
 
@@ -18,10 +21,20 @@ type RootRef struct { // ROOT_REF=156 ROOT_BACKREF=144
 }
 
 func (o *RootRef) UnmarshalBinary(dat []byte) (int, error) {
+	if err := binutil.NeedNBytes(dat, 0x12); 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, 0x12+int(o.NameLen)); err != nil {
+		return 0, err
+	}
 	o.Name = dat[n : n+int(o.NameLen)]
 	n += int(o.NameLen)
 	return n, nil