boot/grub2/0032-efi-Add-secure-boot-detection.patch

21  grub-core/kern/efi/sb.c     | 109 ++++++++++++++++++++++++++++++++++++++++++++
25  create mode 100644 grub-core/kern/efi/sb.c
48 …c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/…
49 …c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/…
50  nodist_kernel_exec_SOURCES  = symlist.c  ## platform nodist sources
57 …c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl…
58 …c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl…
59  nodist_kernel_exec_SOURCES  = symlist.c  ## platform nodist sources
66 …c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/ef…
67 …c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/ef…
68  nodist_kernel_exec_SOURCES  = symlist.c  ## platform nodist sources
75 …c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S …
76 …c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S …
77  nodist_kernel_exec_SOURCES  = symlist.c  ## platform nodist sources
84 …c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.…
85 …c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.…
86  nodist_kernel_exec_SOURCES  = symlist.c  ## platform nodist sources
93 …c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/e…
94 …c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/e…
95  nodist_kernel_exec_SOURCES  = symlist.c  ## platform nodist sources
102 …c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c ke…
103 …c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c ke…
104  nodist_kernel_exec_SOURCES  = symlist.c  ## platform nodist sources
112    efi = term/efi/console.c;
113    efi = kern/acpi.c;
114    efi = kern/efi/acpi.c;
115 +  efi = kern/efi/sb.c;
116    i386_coreboot = kern/i386/pc/acpi.c;
117    i386_multiboot = kern/i386/pc/acpi.c;
118    i386_coreboot = kern/acpi.c;
124  	kern/arm64/cache_flush.S kern/arm64/dl.c \
125  	kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c \
126  	kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c \
127 -	kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c \
128 -	kern/generic/millisleep.c kern/command.c kern/corecmd.c \
129 -	kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \
130 -	kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c \
131 -	kern/parser.c kern/partition.c kern/rescue_parser.c \
132 -	kern/rescue_reader.c kern/term.c kern/arm/startup.S \
133 -	kern/arm/coreboot/init.c kern/arm/coreboot/timer.c \
134 -	kern/arm/coreboot/coreboot.S lib/fdt.c bus/fdt.c term/ps2.c \
135 -	term/arm/pl050.c term/arm/cros.c term/arm/cros_ec.c \
136 -	bus/spi/rk3288_spi.c commands/keylayouts.c \
137 -	kern/arm/coreboot/dma.c kern/arm/coreboot/cbtable.c \
138 -	video/coreboot/cbfb.c kern/coreboot/mmap.c \
139 -	kern/coreboot/cbtable.c term/gfxterm.c font/font.c \
140 -	font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c \
141 -	video/fb/fbutil.c video/fb/video_fb.c video/video.c \
142 -	kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S \
143 -	kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S \
144 -	lib/division.c kern/arm/efi/startup.S kern/arm/efi/init.c \
145 -	kern/arm/uboot/init.c kern/arm/uboot/uboot.S \
146 -	disk/uboot/ubootdisk.c kern/uboot/uboot.c kern/uboot/init.c \
147 -	kern/uboot/hw.c term/uboot/console.c term/terminfo.c \
148 -	term/tparm.c commands/extcmd.c lib/arg.c disk/host.c \
149 -	kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c \
150 -	osdep/exec.c osdep/devmapper/hostdisk.c osdep/hostdisk.c \
151 -	kern/emu/hostfs.c kern/emu/main.c kern/emu/argp_common.c \
152 -	kern/emu/misc.c kern/emu/mm.c kern/emu/time.c kern/emu/cache.c \
153 +	kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c \
154 +	kern/time.c kern/generic/millisleep.c kern/command.c \
155 +	kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c \
156 +	kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c \
157 +	kern/misc.c kern/parser.c kern/partition.c \
158 +	kern/rescue_parser.c kern/rescue_reader.c kern/term.c \
159 +	kern/arm/startup.S kern/arm/coreboot/init.c \
160 +	kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S \
161 +	lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c \
162 +	term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c \
163 +	commands/keylayouts.c kern/arm/coreboot/dma.c \
164 +	kern/arm/coreboot/cbtable.c video/coreboot/cbfb.c \
165 +	kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c \
166 +	font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c \
167 +	video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c \
168 +	video/video.c kern/arm/dl.c kern/arm/dl_helper.c \
169 +	kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c \
170 +	kern/arm/compiler-rt.S lib/division.c kern/arm/efi/startup.S \
171 +	kern/arm/efi/init.c kern/arm/uboot/init.c \
172 +	kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c \
173 +	kern/uboot/uboot.c kern/uboot/init.c kern/uboot/hw.c \
174 +	term/uboot/console.c term/terminfo.c term/tparm.c \
175 +	commands/extcmd.c lib/arg.c disk/host.c kern/emu/cache_s.S \
176 +	kern/emu/hostdisk.c osdep/unix/hostdisk.c osdep/exec.c \
177 +	osdep/devmapper/hostdisk.c osdep/hostdisk.c kern/emu/hostfs.c \
178 +	kern/emu/main.c kern/emu/argp_common.c kern/emu/misc.c \
179 +	kern/emu/mm.c kern/emu/time.c kern/emu/cache.c \
180  	osdep/emuconsole.c osdep/dl.c osdep/sleep.c osdep/init.c \
181  	osdep/emunet.c osdep/cputime.c kern/i386/coreboot/startup.S \
182  	kern/i386/coreboot/init.c kern/i386/pc/acpi.c \
248  @COND_arm64_efi_TRUE@	kern/arm64/dl_helper.c disk/efi/efidisk.c \
249  @COND_arm64_efi_TRUE@	kern/efi/efi.c kern/efi/init.c \
250  @COND_arm64_efi_TRUE@	kern/efi/mm.c term/efi/console.c \
251 -@COND_arm64_efi_TRUE@	kern/acpi.c kern/efi/acpi.c \
252 +@COND_arm64_efi_TRUE@	kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \
253  @COND_arm64_efi_TRUE@	kern/compiler-rt.c kern/mm.c kern/time.c \
254  @COND_arm64_efi_TRUE@	kern/generic/millisleep.c kern/command.c \
255  @COND_arm64_efi_TRUE@	kern/corecmd.c kern/device.c kern/disk.c \
257  @COND_arm_efi_TRUE@	disk/efi/efidisk.c kern/efi/efi.c \
258  @COND_arm_efi_TRUE@	kern/efi/init.c kern/efi/mm.c \
259  @COND_arm_efi_TRUE@	term/efi/console.c kern/acpi.c \
260 -@COND_arm_efi_TRUE@	kern/efi/acpi.c kern/compiler-rt.c \
261 -@COND_arm_efi_TRUE@	kern/mm.c kern/time.c \
262 +@COND_arm_efi_TRUE@	kern/efi/acpi.c kern/efi/sb.c \
263 +@COND_arm_efi_TRUE@	kern/compiler-rt.c kern/mm.c kern/time.c \
264  @COND_arm_efi_TRUE@	kern/generic/millisleep.c kern/command.c \
265  @COND_arm_efi_TRUE@	kern/corecmd.c kern/device.c kern/disk.c \
266  @COND_arm_efi_TRUE@	kern/dl.c kern/env.c kern/err.c kern/file.c \
268  @COND_i386_efi_TRUE@	kern/i386/tsc_pit.c disk/efi/efidisk.c \
269  @COND_i386_efi_TRUE@	kern/efi/efi.c kern/efi/init.c \
270  @COND_i386_efi_TRUE@	kern/efi/mm.c term/efi/console.c \
271 -@COND_i386_efi_TRUE@	kern/acpi.c kern/efi/acpi.c \
272 +@COND_i386_efi_TRUE@	kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \
273  @COND_i386_efi_TRUE@	kern/compiler-rt.c kern/mm.c kern/time.c \
274  @COND_i386_efi_TRUE@	kern/generic/millisleep.c kern/command.c \
275  @COND_i386_efi_TRUE@	kern/corecmd.c kern/device.c kern/disk.c \
277  @COND_ia64_efi_TRUE@	lib/division.c disk/efi/efidisk.c \
278  @COND_ia64_efi_TRUE@	kern/efi/efi.c kern/efi/init.c \
279  @COND_ia64_efi_TRUE@	kern/efi/mm.c term/efi/console.c \
280 -@COND_ia64_efi_TRUE@	kern/acpi.c kern/efi/acpi.c \
281 +@COND_ia64_efi_TRUE@	kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \
282  @COND_ia64_efi_TRUE@	kern/compiler-rt.c kern/mm.c kern/time.c \
283  @COND_ia64_efi_TRUE@	kern/generic/millisleep.c kern/command.c \
284  @COND_ia64_efi_TRUE@	kern/corecmd.c kern/device.c kern/disk.c \
286  @COND_riscv32_efi_TRUE@	disk/efi/efidisk.c kern/efi/efi.c \
287  @COND_riscv32_efi_TRUE@	kern/efi/init.c kern/efi/mm.c \
288  @COND_riscv32_efi_TRUE@	term/efi/console.c kern/acpi.c \
289 -@COND_riscv32_efi_TRUE@	kern/efi/acpi.c kern/compiler-rt.c \
290 -@COND_riscv32_efi_TRUE@	kern/mm.c kern/time.c \
291 -@COND_riscv32_efi_TRUE@	kern/generic/millisleep.c \
292 +@COND_riscv32_efi_TRUE@	kern/efi/acpi.c kern/efi/sb.c \
293 +@COND_riscv32_efi_TRUE@	kern/compiler-rt.c kern/mm.c \
294 +@COND_riscv32_efi_TRUE@	kern/time.c kern/generic/millisleep.c \
295  @COND_riscv32_efi_TRUE@	kern/command.c kern/corecmd.c \
296  @COND_riscv32_efi_TRUE@	kern/device.c kern/disk.c kern/dl.c \
297  @COND_riscv32_efi_TRUE@	kern/env.c kern/err.c kern/file.c \
299  @COND_riscv64_efi_TRUE@	kern/efi/efi.c kern/efi/init.c \
300  @COND_riscv64_efi_TRUE@	kern/efi/mm.c term/efi/console.c \
301  @COND_riscv64_efi_TRUE@	kern/acpi.c kern/efi/acpi.c \
302 -@COND_riscv64_efi_TRUE@	kern/compiler-rt.c kern/mm.c \
303 -@COND_riscv64_efi_TRUE@	kern/time.c kern/generic/millisleep.c \
304 +@COND_riscv64_efi_TRUE@	kern/efi/sb.c kern/compiler-rt.c \
305 +@COND_riscv64_efi_TRUE@	kern/mm.c kern/time.c \
306 +@COND_riscv64_efi_TRUE@	kern/generic/millisleep.c \
307  @COND_riscv64_efi_TRUE@	kern/command.c kern/corecmd.c \
308  @COND_riscv64_efi_TRUE@	kern/device.c kern/disk.c kern/dl.c \
309  @COND_riscv64_efi_TRUE@	kern/env.c kern/err.c kern/file.c \
311  @COND_x86_64_efi_TRUE@	kern/efi/efi.c kern/efi/init.c \
312  @COND_x86_64_efi_TRUE@	kern/efi/mm.c term/efi/console.c \
313  @COND_x86_64_efi_TRUE@	kern/acpi.c kern/efi/acpi.c \
314 -@COND_x86_64_efi_TRUE@	kern/compiler-rt.c kern/mm.c kern/time.c \
315 +@COND_x86_64_efi_TRUE@	kern/efi/sb.c kern/compiler-rt.c \
316 +@COND_x86_64_efi_TRUE@	kern/mm.c kern/time.c \
317  @COND_x86_64_efi_TRUE@	kern/generic/millisleep.c kern/command.c \
318  @COND_x86_64_efi_TRUE@	kern/corecmd.c kern/device.c kern/disk.c \
319  @COND_x86_64_efi_TRUE@	kern/dl.c kern/env.c kern/err.c \
337 @@ -35285,6 +35299,20 @@ kern/efi/kernel_exec-acpi.obj: kern/efi/acpi.c
339 …) -c -o kern/efi/kernel_exec-acpi.obj `if test -f 'kern/efi/acpi.c'; then $(CYGPATH_W) 'kern/efi/a…
341 +kern/efi/kernel_exec-sb.o: kern/efi/sb.c
342 …/$(DEPDIR)/kernel_exec-sb.Tpo -c -o kern/efi/kernel_exec-sb.o `test -f 'kern/efi/sb.c' || echo '$(…
344 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kern/efi/sb.c' object='kern/efi/kernel_exec-sb…
346 …kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/efi/kernel_exec-sb.o `test -f 'kern/efi/sb.c' || echo '$(…
348 +kern/efi/kernel_exec-sb.obj: kern/efi/sb.c
349 …b.Tpo -c -o kern/efi/kernel_exec-sb.obj `if test -f 'kern/efi/sb.c'; then $(CYGPATH_W) 'kern/efi/s…
351 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='kern/efi/sb.c' object='kern/efi/kernel_exec-sb…
353 …LAGS) -c -o kern/efi/kernel_exec-sb.obj `if test -f 'kern/efi/sb.c'; then $(CYGPATH_W) 'kern/efi/s…
355  kern/kernel_exec-compiler-rt.o: kern/compiler-rt.c
356 …l_exec-compiler-rt.Tpo -c -o kern/kernel_exec-compiler-rt.o `test -f 'kern/compiler-rt.c' || echo …
358 diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c
362 +++ b/grub-core/kern/efi/sb.c
366 + *  Copyright (C) 2020  Free Software Foundation, Inc.
396 + * drivers/firmware/efi/libstub/secureboot.c:efi_get_secureboot().
481 + *  Copyright (C) 2020  Free Software Foundation, Inc.
524  ./grub-core/kern/efi/fdt.c
525  ./grub-core/kern/efi/init.c
526  ./grub-core/kern/efi/mm.c
527 +./grub-core/kern/efi/sb.c
528  ./grub-core/kern/elf.c
529  ./grub-core/kern/elfXX.c
530  ./grub-core/kern/emu/argp_common.c