From c0e411f81d01607fa59338365933232231738581 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Thu, 25 May 2017 14:18:44 +0200
Subject: contentenc: better error reporting in ParseHeader

Log the message ourselves and return EINVAL.

Before:

	gocryptfs[26962]: go-fuse: can't convert error type: ParseHeader: invalid version: got 0, want 2

After:

	gocryptfs[617]: ParseHeader: invalid version: want 2, got 0. Returning EINVAL.
---
 internal/contentenc/file_header.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'internal/contentenc/file_header.go')

diff --git a/internal/contentenc/file_header.go b/internal/contentenc/file_header.go
index 5c05818..8a08ef0 100644
--- a/internal/contentenc/file_header.go
+++ b/internal/contentenc/file_header.go
@@ -6,10 +6,11 @@ package contentenc
 
 import (
 	"encoding/binary"
-	"fmt"
 	"log"
+	"syscall"
 
 	"github.com/rfjakob/gocryptfs/internal/cryptocore"
+	"github.com/rfjakob/gocryptfs/internal/tlog"
 )
 
 const (
@@ -43,12 +44,14 @@ func (h *FileHeader) Pack() []byte {
 // ParseHeader - parse "buf" into fileHeader object
 func ParseHeader(buf []byte) (*FileHeader, error) {
 	if len(buf) != HeaderLen {
-		return nil, fmt.Errorf("ParseHeader: invalid length: got %d, want %d", len(buf), HeaderLen)
+		tlog.Warn.Printf("ParseHeader: invalid length: want %d bytes, got %d. Returning EINVAL.", HeaderLen, len(buf))
+		return nil, syscall.EINVAL
 	}
 	var h FileHeader
 	h.Version = binary.BigEndian.Uint16(buf[0:headerVersionLen])
 	if h.Version != CurrentVersion {
-		return nil, fmt.Errorf("ParseHeader: invalid version: got %d, want %d", h.Version, CurrentVersion)
+		tlog.Warn.Printf("ParseHeader: invalid version: want %d, got %d. Returning EINVAL.", CurrentVersion, h.Version)
+		return nil, syscall.EINVAL
 	}
 	h.ID = buf[headerVersionLen:]
 	return &h, nil
-- 
cgit v1.2.3