cea12ba3c4
* fix: prevent makeslice panic in ReadNeedleMeta with corrupted needle When a needle's DataSize in the .dat file is corrupted to a very large value, the calculation of metaSize can become negative, causing a panic with 'makeslice: len out of range' when creating the metadata slice. This fix adds validation to check if metaSize is negative before creating the slice, returning a descriptive error instead of panicking. Fixes #7475 * Update weed/storage/needle/needle_read_page.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
96 lines
2.6 KiB
Go
96 lines
2.6 KiB
Go
package needle
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/backend"
|
|
. "github.com/seaweedfs/seaweedfs/weed/storage/types"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
)
|
|
|
|
// ReadNeedleData uses a needle without n.Data to read the content
|
|
// volumeOffset: the offset within the volume
|
|
// needleOffset: the offset within the needle Data
|
|
func (n *Needle) ReadNeedleData(r backend.BackendStorageFile, volumeOffset int64, data []byte, needleOffset int64) (count int, err error) {
|
|
|
|
sizeToRead := min(int64(len(data)), int64(n.DataSize)-needleOffset)
|
|
if sizeToRead <= 0 {
|
|
return 0, io.EOF
|
|
}
|
|
startOffset := volumeOffset + NeedleHeaderSize + DataSizeSize + needleOffset
|
|
|
|
count, err = r.ReadAt(data[:sizeToRead], startOffset)
|
|
if err == io.EOF && int64(count) == sizeToRead {
|
|
err = nil
|
|
}
|
|
if err != nil {
|
|
fileSize, _, _ := r.GetStat()
|
|
glog.Errorf("%s read %d %d size %d at offset %d fileSize %d: %v", r.Name(), n.Id, needleOffset, sizeToRead, volumeOffset, fileSize, err)
|
|
}
|
|
return
|
|
|
|
}
|
|
|
|
// ReadNeedleMeta fills all metadata except the n.Data
|
|
func (n *Needle) ReadNeedleMeta(r backend.BackendStorageFile, offset int64, size Size, version Version) (err error) {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
err = fmt.Errorf("panic occurred: %+v", r)
|
|
}
|
|
}()
|
|
|
|
bytes := make([]byte, NeedleHeaderSize+DataSizeSize)
|
|
|
|
count, err := r.ReadAt(bytes, offset)
|
|
if err == io.EOF && count == NeedleHeaderSize+DataSizeSize {
|
|
err = nil
|
|
}
|
|
if count != NeedleHeaderSize+DataSizeSize || err != nil {
|
|
return err
|
|
}
|
|
n.ParseNeedleHeader(bytes)
|
|
if n.Size != size {
|
|
if OffsetSize == 4 && offset < int64(MaxPossibleVolumeSize) {
|
|
return ErrorSizeMismatch
|
|
}
|
|
}
|
|
n.DataSize = util.BytesToUint32(bytes[NeedleHeaderSize : NeedleHeaderSize+DataSizeSize])
|
|
startOffset := offset + NeedleHeaderSize
|
|
if size.IsValid() {
|
|
startOffset = offset + NeedleHeaderSize + DataSizeSize + int64(n.DataSize)
|
|
}
|
|
dataSize := GetActualSize(size, version)
|
|
stopOffset := offset + dataSize
|
|
metaSize := stopOffset - startOffset
|
|
if metaSize < 0 || metaSize > 128*1024 {
|
|
return fmt.Errorf("invalid needle meta size %d: DataSize=%d, size=%d, offset=%d", metaSize, n.DataSize, size, offset)
|
|
}
|
|
metaSlice := make([]byte, int(metaSize))
|
|
|
|
count, err = r.ReadAt(metaSlice, startOffset)
|
|
if err != nil && int64(count) == metaSize {
|
|
err = nil
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var index int
|
|
if size.IsValid() {
|
|
index, err = n.readNeedleDataVersion2NonData(metaSlice)
|
|
}
|
|
|
|
err = n.readNeedleTail(metaSlice[index:], version)
|
|
return err
|
|
|
|
}
|
|
|
|
func min(x, y int64) int64 {
|
|
if x < y {
|
|
return x
|
|
}
|
|
return y
|
|
}
|