Merge pull request #552 from rgooch/master

Bugfixes: panic in objectserver and image-unpacker makes unbootable images.
Symantec · Jan 24, 2019 · 2b7173b · 2b7173b
2 parents 6d4413c + 7832916
commit 2b7173b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/lib/filesystem/util/writeRaw.go b/lib/filesystem/util/writeRaw.go
@@ -294,7 +294,6 @@ func makeBootable(fs *filesystem.FileSystem,
 	if bootInfo, err := getBootInfo(fs, rootLabel, kernelOptions); err != nil {
 		return err
 	} else {
-		bootInfo.KernelOptions = kernelOptions
 		return bootInfo.installBootloader(deviceName, rootDir, rootLabel,
 			doChroot, logger)
 	}

diff --git a/lib/objectcache/filename.go b/lib/objectcache/filename.go
@@ -7,7 +7,7 @@ import (
 )
 
 func filenameToHash(fileName string) (hash.Hash, error) {
-	var hash hash.Hash
+	var hashVal hash.Hash
 	var prev_nibble byte = 16
 	index := 0
 	for _, char := range fileName {
@@ -20,16 +20,19 @@ func filenameToHash(fileName string) (hash.Hash, error) {
 			continue // Ignore everything else. Treat them as separators.
 		}
 		if prev_nibble < 16 {
-			hash[index] = nibble | prev_nibble<<4
+			if index >= len(hashVal) {
+				return hashVal, fmt.Errorf("filename too long: %s", fileName)
+			}
+			hashVal[index] = nibble | prev_nibble<<4
 			index++
 			prev_nibble = 16
 		} else {
 			prev_nibble = nibble
 		}
 	}
-	return hash, nil
+	return hashVal, nil
 }
 
-func hashToFilename(hash hash.Hash) string {
-	return fmt.Sprintf("%02x/%02x/%0x", hash[0], hash[1], hash[2:])
+func hashToFilename(hashVal hash.Hash) string {
+	return fmt.Sprintf("%02x/%02x/%0x", hashVal[0], hashVal[1], hashVal[2:])
 }