Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

torvalds · torvalds · commit fa36bbe6d43f · 2021-12-16T10:44:20.000-08:00
Pull arm64 fix from Catalin Marinas:
 "Fix missing error code on kexec failure path"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: kexec: Fix missing error code 'ret' warning in load_other_segments()
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
@@ -149,6 +149,7 @@ int load_other_segments(struct kimage *image,
 					   initrd_len, cmdline, 0);
 	if (!dtb) {
 		pr_err("Preparing for new dtb failed\n");
+		ret = -EINVAL;
 		goto out_err;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ int load_other_segments(struct kimage *image,`
`149`	`149`	`initrd_len, cmdline, 0);`
`150`	`150`	`if (!dtb) {`
`151`	`151`	`pr_err("Preparing for new dtb failed\n");`
	`152`	`+ ret = -EINVAL;`
`152`	`153`	`goto out_err;`
`153`	`154`	`}`
`154`	`155`