Merge pull request #1301 from anatasluo/master

jpoimboe · web-flow · commit 80fc15ac363a · 2022-09-23T10:15:55.000-05:00
kpatch-build: rela section could disappear after patched
diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c
@@ -974,7 +974,7 @@ static void kpatch_correlate_section(struct section *sec_orig,
 		__kpatch_correlate_section(sec_orig->base, sec_patched->base);
 		sec_orig = sec_orig->base;
 		sec_patched = sec_patched->base;
-	} else if (sec_orig->rela) {
+	} else if (sec_orig->rela && sec_patched->rela) {
 		__kpatch_correlate_section(sec_orig->rela, sec_patched->rela);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -974,7 +974,7 @@ static void kpatch_correlate_section(struct section *sec_orig,`
`974`	`974`	`__kpatch_correlate_section(sec_orig->base, sec_patched->base);`
`975`	`975`	`sec_orig = sec_orig->base;`
`976`	`976`	`sec_patched = sec_patched->base;`
`977`		`- } else if (sec_orig->rela) {`
	`977`	`+ } else if (sec_orig->rela && sec_patched->rela) {`
`978`	`978`	`__kpatch_correlate_section(sec_orig->rela, sec_patched->rela);`
`979`	`979`	`}`
`980`	`980`