mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-11-28 21:39:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix possible out of range bytes

Browse Source 
avoid buff out of range resp.Data = buff[:totalRead]
This commit is contained in:
Chris Lu 2020-08-16 23:47:34 -07:00
parent 48ed7f8a32
commit 2ac27616bc
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
weed/filesys/dirty_page.go
View File

@ -172,7 +172,7 @@ func min(x, y int64) int64 {
return y return y
} }
func (pages *ContinuousDirtyPages) ReadDirtyData(data []byte, startOffset int64) (offset int64, size int) { func (pages *ContinuousDirtyPages) ReadDirtyData(data []byte, startOffset int64) (maxStop int64) {
pages.lock.Lock() pages.lock.Lock()
defer pages.lock.Unlock() defer pages.lock.Unlock()

15
weed/filesys/dirty_page_interval.go
View File

@ -3,7 +3,6 @@ package filesys
import ( import (
"bytes" "bytes"
"io" "io"
"math"
) )
type IntervalNode struct { type IntervalNode struct {
@ -186,25 +185,15 @@ func (c *ContinuousIntervals) removeList(target *IntervalLinkedList) {
} }
func (c *ContinuousIntervals) ReadData(data []byte, startOffset int64) (offset int64, size int) { func (c *ContinuousIntervals) ReadData(data []byte, startOffset int64) (maxStop int64) {
var minOffset int64 = math.MaxInt64
var maxStop int64
for _, list := range c.lists { for _, list := range c.lists {
start := max(startOffset, list.Offset()) start := max(startOffset, list.Offset())
stop := min(startOffset+int64(len(data)), list.Offset()+list.Size()) stop := min(startOffset+int64(len(data)), list.Offset()+list.Size())
if start <= stop { if start < stop {
list.ReadData(data[start-startOffset:], start, stop) list.ReadData(data[start-startOffset:], start, stop)
minOffset = min(minOffset, start)
maxStop = max(maxStop, stop) maxStop = max(maxStop, stop)
} }
} }
if minOffset == math.MaxInt64 {
return 0, 0
}
offset = minOffset
size = int(maxStop - offset)
return return
} }

11
weed/filesys/filehandle.go
View File

@ -54,7 +54,7 @@ var _ = fs.HandleReleaser(&FileHandle{})
func (fh *FileHandle) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error { func (fh *FileHandle) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error {
glog.V(5).Infof("%s read fh %d: [%d,%d) size %d resp.Data len=%d cap=%d", fh.f.fullpath(), fh.handle, req.Offset, req.Offset+int64(req.Size), req.Size, len(resp.Data), cap(resp.Data)) glog.V(4).Infof("%s read fh %d: [%d,%d) size %d resp.Data len=%d cap=%d", fh.f.fullpath(), fh.handle, req.Offset, req.Offset+int64(req.Size), req.Size, len(resp.Data), cap(resp.Data))
buff := resp.Data[:cap(resp.Data)] buff := resp.Data[:cap(resp.Data)]
if req.Size > cap(resp.Data) { if req.Size > cap(resp.Data) {
@ -64,12 +64,11 @@ func (fh *FileHandle) Read(ctx context.Context, req *fuse.ReadRequest, resp *fus
totalRead, err := fh.readFromChunks(buff, req.Offset) totalRead, err := fh.readFromChunks(buff, req.Offset)
if err == nil { if err == nil {
dirtyOffset, dirtySize := fh.readFromDirtyPages(buff, req.Offset) maxStop := fh.readFromDirtyPages(buff, req.Offset)
if totalRead+req.Offset < dirtyOffset+int64(dirtySize) { totalRead = max(maxStop - req.Offset, totalRead)
totalRead = dirtyOffset + int64(dirtySize) - req.Offset
}
} }
totalRead = min(int64(len(buff)), totalRead)
resp.Data = buff[:totalRead] resp.Data = buff[:totalRead]
if err != nil { if err != nil {
@ -80,7 +79,7 @@ func (fh *FileHandle) Read(ctx context.Context, req *fuse.ReadRequest, resp *fus
return err return err
} }
func (fh *FileHandle) readFromDirtyPages(buff []byte, startOffset int64) (offset int64, size int) { func (fh *FileHandle) readFromDirtyPages(buff []byte, startOffset int64) (maxStop int64) {
return fh.dirtyPages.ReadDirtyData(buff, startOffset) return fh.dirtyPages.ReadDirtyData(buff, startOffset)
} }