Commitfa111de

committed

kexec,linux,arm64: avoid the dt.LoadFDT API

Signed-off-by: Chris Koch <chrisko@google.com>

1 parent72f8842 commitfa111deCopy full SHA for fa111de

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`"errors"`
`11`	`11`	`"fmt"`
`12`	`12`	`"io"`
	`13`	`+"math"`
`13`	`14`	`"os"`
`14`	`15`
`15`	`16`	`"github.com/u-root/u-root/pkg/boot/image"`
`@@ -55,9 +56,17 @@ func sanitizeFDT(fdt dt.FDT) (dt.Node, error) {`
`55`	`56`	`varErrMemmapEmpty=errors.New("memory map is empty or contains no information about system RAM")`
`56`	`57`
`57`	`58`	`funckexecLoadImage(kernel,ramfsos.File,cmdlinestring,dtb io.ReaderAt) (kimage,error) {`
`58`		`-fdt,err:=dt.LoadFDT(dtb)`
	`59`	`+varfdt*dt.FDT`
	`60`	`+varerrerror`
	`61`	`+// We want to fail when a user-supplied FDT is not parseable, not`
	`62`	`+// implicitly fall back to some other FDT. Avoid the dt.LoadFDT API.`
	`63`	`+ifdtb!=nil {`
	`64`	`+fdt,err=dt.ReadFDT(io.NewSectionReader(dtb,0,math.MaxInt64))`
	`65`	`+}else {`
	`66`	`+fdt,err=dt.ReadFile("/sys/firmware/fdt")`
	`67`	`+}`
`59`	`68`	`iferr!=nil {`
`60`		`-returnnil,fmt.Errorf("loadFDT(%s)= %w",dtb,err)`
	`69`	`+returnnil,fmt.Errorf("Read FDT= %w",err)`
`61`	`70`	`}`
`62`	`71`	`Debug("Loaded FDT: %s",fdt)`
`63`	`72`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ func TestKexecLoadImage(t *testing.T) {`
`312`	`312`	`{`
`313`	`313`	`name:"loadFDT fails",`
`314`	`314`	`fdt:closedFile(t),`
`315`		`-errs: []error{dt.ErrNoValidReaders},`
	`315`	`+errs: []error{os.ErrClosed},`
`316`	`316`	`},`
`317`	`317`	`{`
`318`	`318`	`name:"invalid-memmap",`

Comments

(0)