expand smart data file limit to 64KB

Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
lf-edge · Nov 10, 2021 · 6dd783a · 6dd783a
1 parent b1a7a04
commit 6dd783a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pkg/pillar/cmd/nodeagent/nodeagent.go b/pkg/pillar/cmd/nodeagent/nodeagent.go
@@ -57,6 +57,7 @@ const (
 	maxDomainHaltTime       uint32 = 300
 	domainHaltWaitIncrement uint32 = 5
 	maxReadSize                    = 16384 // From files in /persist
+	maxSmartCtlSize                = 65536 // Limit size of smartctl output files read
 )
 
 var (
@@ -696,7 +697,7 @@ func parseSMARTData() {
 	previousSMARTfilename := "/persist/SMART_details_previous.json"
 	parseData := func(filePath string, SMARTDataObj *types.SmartData) {
 		data, err := fileutils.ReadWithMaxSize(log, filePath,
-			maxReadSize)
+			maxSmartCtlSize)
 		if err != nil {
 			log.Errorf("parseSMARTData: exception while opening %s. %s", filePath, err.Error())
 			return

diff --git a/pkg/pillar/cmd/zedagent/reportinfo.go b/pkg/pillar/cmd/zedagent/reportinfo.go
@@ -9,7 +9,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -25,14 +24,16 @@ import (
 	"github.com/lf-edge/eve/pkg/pillar/netclone"
 	"github.com/lf-edge/eve/pkg/pillar/types"
 	"github.com/lf-edge/eve/pkg/pillar/utils"
+	fileutils "github.com/lf-edge/eve/pkg/pillar/utils/file"
 	"github.com/lf-edge/eve/pkg/pillar/vault"
 	"github.com/lf-edge/eve/pkg/pillar/zedcloud"
 	"github.com/shirou/gopsutil/host"
 )
 
 var (
-	nilIPInfo = ipinfo.IPInfo{}
-	smartData = types.NewSmartDataWithDefaults()
+	nilIPInfo       = ipinfo.IPInfo{}
+	smartData       = types.NewSmartDataWithDefaults()
+	maxSmartCtlSize = 65536 // Limit size of smartctl output files
 )
 
 func deviceInfoTask(ctxPtr *zedagentContext, triggerDeviceInfo <-chan struct{}) {
@@ -926,7 +927,8 @@ func createAppInstances(ctxPtr *zedagentContext,
 
 func parseSMARTData() {
 	filename := "/persist/SMART_details.json"
-	data, err := ioutil.ReadFile(filename)
+	data, err := fileutils.ReadWithMaxSize(log, filename,
+		maxSmartCtlSize)
 	if err != nil {
 		log.Errorf("parseSMARTData: exception while opening %s. %s", filename, err.Error())
 		return