update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/s390/kernel/kexec_elf.c
..
..
@@ -10,18 +10,20 @@
10
10
 #include <linux/errno.h>
11
11
 #include <linux/kernel.h>
12
12
 #include <linux/kexec.h>
13
+#include <asm/ipl.h>
13
14
 #include <asm/setup.h>
14
15
 
15
-static int kexec_file_add_elf_kernel(struct kimage *image,
16
-				     struct s390_load_data *data,
17
-				     char *kernel, unsigned long kernel_len)
16
+static int kexec_file_add_kernel_elf(struct kimage *image,
17
+				     struct s390_load_data *data)
18
18
 {
19
19
 	struct kexec_buf buf;
20
20
 	const Elf_Ehdr *ehdr;
21
21
 	const Elf_Phdr *phdr;
22
22
 	Elf_Addr entry;
23
+	void *kernel;
23
24
 	int i, ret;
24
25
 
26
+	kernel = image->kernel_buf;
25
27
 	ehdr = (Elf_Ehdr *)kernel;
26
28
 	buf.image = image;
27
29
 	if (image->type == KEXEC_TYPE_CRASH)
..
..
@@ -38,30 +40,27 @@
38
40
 		buf.bufsz = phdr->p_filesz;
39
41
 
40
42
 		buf.mem = ALIGN(phdr->p_paddr, phdr->p_align);
43
+		if (image->type == KEXEC_TYPE_CRASH)
44
+			buf.mem += crashk_res.start;
41
45
 		buf.memsz = phdr->p_memsz;
46
+		data->memsz = ALIGN(data->memsz, phdr->p_align) + buf.memsz;
42
47
 
43
48
 		if (entry - phdr->p_paddr < phdr->p_memsz) {
44
49
 			data->kernel_buf = buf.buffer;
45
-			data->memsz += STARTUP_NORMAL_OFFSET;
46
-
47
-			buf.buffer += STARTUP_NORMAL_OFFSET;
48
-			buf.bufsz -= STARTUP_NORMAL_OFFSET;
49
-
50
-			buf.mem += STARTUP_NORMAL_OFFSET;
51
-			buf.memsz -= STARTUP_NORMAL_OFFSET;
50
+			data->kernel_mem = buf.mem;
51
+			data->parm = buf.buffer + PARMAREA;
52
52
 		}
53
53
 
54
-		if (image->type == KEXEC_TYPE_CRASH)
55
-			buf.mem += crashk_res.start;
56
-
54
+		ipl_report_add_component(data->report, &buf,
55
+					 IPL_RB_COMPONENT_FLAG_SIGNED |
56
+					 IPL_RB_COMPONENT_FLAG_VERIFIED,
57
+					 IPL_RB_CERT_UNKNOWN);
57
58
 		ret = kexec_add_buffer(&buf);
58
59
 		if (ret)
59
60
 			return ret;
60
-
61
-		data->memsz = ALIGN(data->memsz, phdr->p_align) + buf.memsz;
62
61
 	}
63
62
 
64
-	return 0;
63
+	return data->memsz ? 0 : -EINVAL;
65
64
 }
66
65
 
67
66
 static void *s390_elf_load(struct kimage *image,
..
..
@@ -69,11 +68,10 @@
69
68
 			   char *initrd, unsigned long initrd_len,
70
69
 			   char *cmdline, unsigned long cmdline_len)
71
70
 {
72
-	struct s390_load_data data = {0};
73
71
 	const Elf_Ehdr *ehdr;
74
72
 	const Elf_Phdr *phdr;
75
73
 	size_t size;
76
-	int i, ret;
74
+	int i;
77
75
 
78
76
 	/* image->fobs->probe already checked for valid ELF magic number. */
79
77
 	ehdr = (Elf_Ehdr *)kernel;
..
..
@@ -106,24 +104,7 @@
106
104
 	if (size > kernel_len)
107
105
 		return ERR_PTR(-EINVAL);
108
106
 
109
-	ret = kexec_file_add_elf_kernel(image, &data, kernel, kernel_len);
110
-	if (ret)
111
-		return ERR_PTR(ret);
112
-
113
-	if (!data.memsz)
114
-		return ERR_PTR(-EINVAL);
115
-
116
-	if (initrd) {
117
-		ret = kexec_file_add_initrd(image, &data, initrd, initrd_len);
118
-		if (ret)
119
-			return ERR_PTR(ret);
120
-	}
121
-
122
-	ret = kexec_file_add_purgatory(image, &data);
123
-	if (ret)
124
-		return ERR_PTR(ret);
125
-
126
-	return kexec_file_update_kernel(image, &data);
107
+	return kexec_file_add_components(image, kexec_file_add_kernel_elf);
127
108
 }
128
109
 
129
110
 static int s390_elf_probe(const char *buf, unsigned long len)
..
..
@@ -149,4 +130,7 @@
149
130
 const struct kexec_file_ops s390_kexec_elf_ops = {
150
131
 	.probe = s390_elf_probe,
151
132
 	.load = s390_elf_load,
133
+#ifdef CONFIG_KEXEC_SIG
134
+	.verify_sig = s390_verify_sig,
135
+#endif /* CONFIG_KEXEC_SIG */
152
136
 };