fusefrontend: readFileID: reject files that consist only of a header

A header-only file will be considered empty (this is not supposed to happen).
This makes File ID poisoning more difficult.
This commit is contained in:
Jakob Unterwurzacher 2017-03-12 21:11:02 +01:00
parent d36d53c9bb
commit 14038a1644
1 changed files with 11 additions and 2 deletions

View File

@ -91,11 +91,20 @@ func (f *file) SetInode(n *nodefs.Inode) {
// readFileID loads the file header from disk and extracts the file ID.
// Returns io.EOF if the file is empty.
func (f *file) readFileID() ([]byte, error) {
buf := make([]byte, contentenc.HeaderLen)
_, err := f.fd.ReadAt(buf, 0)
// We read +1 byte to determine if the file has actual content
// and not only the header. A header-only file will be considered empty.
// This makes File ID poisoning more difficult.
readLen := contentenc.HeaderLen + 1
buf := make([]byte, readLen)
n, err := f.fd.ReadAt(buf, 0)
if err != nil {
if err == io.EOF && n != 0 {
tlog.Warn.Printf("ino%d: readFileID: incomplete file, got %d instead of %d bytes",
f.devIno.ino, n, readLen)
}
return nil, err
}
buf = buf[:contentenc.HeaderLen]
h, err := contentenc.ParseHeader(buf)
if err != nil {
return nil, err