0035-kern-Add-lockdown-support.patch 55 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763
  1. From 578c95298bcc46e0296f4c786db64c2ff26ce2cc Mon Sep 17 00:00:00 2001
  2. From: Javier Martinez Canillas <javierm@redhat.com>
  3. Date: Mon, 28 Sep 2020 20:08:02 +0200
  4. Subject: [PATCH] kern: Add lockdown support
  5. When the GRUB starts on a secure boot platform, some commands can be
  6. used to subvert the protections provided by the verification mechanism and
  7. could lead to booting untrusted system.
  8. To prevent that situation, allow GRUB to be locked down. That way the code
  9. may check if GRUB has been locked down and further restrict the commands
  10. that are registered or what subset of their functionality could be used.
  11. The lockdown support adds the following components:
  12. * The grub_lockdown() function which can be used to lockdown GRUB if,
  13. e.g., UEFI Secure Boot is enabled.
  14. * The grub_is_lockdown() function which can be used to check if the GRUB
  15. was locked down.
  16. * A verifier that flags OS kernels, the GRUB modules, Device Trees and ACPI
  17. tables as GRUB_VERIFY_FLAGS_DEFER_AUTH to defer verification to other
  18. verifiers. These files are only successfully verified if another registered
  19. verifier returns success. Otherwise, the whole verification process fails.
  20. For example, PE/COFF binaries verification can be done by the shim_lock
  21. verifier which validates the signatures using the shim_lock protocol.
  22. However, the verification is not deferred directly to the shim_lock verifier.
  23. The shim_lock verifier is hooked into the verification process instead.
  24. * A set of grub_{command,extcmd}_lockdown functions that can be used by
  25. code registering command handlers, to only register unsafe commands if
  26. the GRUB has not been locked down.
  27. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  28. Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
  29. [Add changes to generated files]
  30. Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
  31. ---
  32. Makefile.in | 2 ++
  33. conf/Makefile.common | 2 ++
  34. docs/grub-dev.texi | 27 +++++++++++++++
  35. docs/grub.texi | 8 +++++
  36. grub-core/Makefile.am | 5 ++-
  37. grub-core/Makefile.core.am | 14 ++++----
  38. grub-core/Makefile.core.def | 1 +
  39. grub-core/Makefile.in | 73 ++++++++++++++++++++++++++++++-----------
  40. grub-core/commands/extcmd.c | 23 +++++++++++++
  41. grub-core/kern/command.c | 24 ++++++++++++++
  42. grub-core/kern/lockdown.c | 80 +++++++++++++++++++++++++++++++++++++++++++++
  43. include/grub/command.h | 5 +++
  44. include/grub/extcmd.h | 7 ++++
  45. include/grub/lockdown.h | 44 +++++++++++++++++++++++++
  46. po/POTFILES.in | 2 ++
  47. 15 files changed, 290 insertions(+), 27 deletions(-)
  48. create mode 100644 grub-core/kern/lockdown.c
  49. create mode 100644 include/grub/lockdown.h
  50. diff --git a/Makefile.in b/Makefile.in
  51. index e6a185b..ecb3278 100644
  52. --- a/Makefile.in
  53. +++ b/Makefile.in
  54. @@ -2617,7 +2617,9 @@ CPPFLAGS_PARTTOOL_LIST = -Dgrub_parttool_register=PARTTOOL_LIST_MARKER
  55. CPPFLAGS_TERMINAL_LIST = '-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' \
  56. '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)'
  57. CPPFLAGS_COMMAND_LIST = '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)' \
  58. + '-Dgrub_register_command_lockdown(...)=COMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' \
  59. '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)' \
  60. + '-Dgrub_register_extcmd_lockdown(...)=EXTCOMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' \
  61. '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)'
  62. CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)'
  63. CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \
  64. diff --git a/conf/Makefile.common b/conf/Makefile.common
  65. index 6cd71cb..2a1a886 100644
  66. --- a/conf/Makefile.common
  67. +++ b/conf/Makefile.common
  68. @@ -84,7 +84,9 @@ CPPFLAGS_PARTTOOL_LIST = -Dgrub_parttool_register=PARTTOOL_LIST_MARKER
  69. CPPFLAGS_TERMINAL_LIST = '-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)'
  70. CPPFLAGS_TERMINAL_LIST += '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)'
  71. CPPFLAGS_COMMAND_LIST = '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)'
  72. +CPPFLAGS_COMMAND_LIST += '-Dgrub_register_command_lockdown(...)=COMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)'
  73. CPPFLAGS_COMMAND_LIST += '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)'
  74. +CPPFLAGS_COMMAND_LIST += '-Dgrub_register_extcmd_lockdown(...)=EXTCOMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)'
  75. CPPFLAGS_COMMAND_LIST += '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)'
  76. CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)'
  77. CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \
  78. diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
  79. index ee389fd..635ec72 100644
  80. --- a/docs/grub-dev.texi
  81. +++ b/docs/grub-dev.texi
  82. @@ -86,6 +86,7 @@ This edition documents version @value{VERSION}.
  83. * PFF2 Font File Format::
  84. * Graphical Menu Software Design::
  85. * Verifiers framework::
  86. +* Lockdown framework::
  87. * Copying This Manual:: Copying This Manual
  88. * Index::
  89. @end menu
  90. @@ -2086,6 +2087,32 @@ Optionally at the end of the file @samp{fini}, if it exists, is called with just
  91. the context. If you return no error during any of @samp{init}, @samp{write} and
  92. @samp{fini} then the file is considered as having succeded verification.
  93. +@node Lockdown framework
  94. +@chapter Lockdown framework
  95. +
  96. +The GRUB can be locked down, which is a restricted mode where some operations
  97. +are not allowed. For instance, some commands cannot be used when the GRUB is
  98. +locked down.
  99. +
  100. +The function
  101. +@code{grub_lockdown()} is used to lockdown GRUB and the function
  102. +@code{grub_is_lockdown()} function can be used to check whether lockdown is
  103. +enabled or not. When enabled, the function returns @samp{GRUB_LOCKDOWN_ENABLED}
  104. +and @samp{GRUB_LOCKDOWN_DISABLED} when is not enabled.
  105. +
  106. +The following functions can be used to register the commands that can only be
  107. +used when lockdown is disabled:
  108. +
  109. +@itemize
  110. +
  111. +@item @code{grub_cmd_lockdown()} registers command which should not run when the
  112. +GRUB is in lockdown mode.
  113. +
  114. +@item @code{grub_cmd_lockdown()} registers extended command which should not run
  115. +when the GRUB is in lockdown mode.
  116. +
  117. +@end itemize
  118. +
  119. @node Copying This Manual
  120. @appendix Copying This Manual
  121. diff --git a/docs/grub.texi b/docs/grub.texi
  122. index aefe032..a25459f 100644
  123. --- a/docs/grub.texi
  124. +++ b/docs/grub.texi
  125. @@ -5581,6 +5581,7 @@ environment variables and commands are listed in the same order.
  126. * Using digital signatures:: Booting digitally signed code
  127. * UEFI secure boot and shim:: Booting digitally signed PE files
  128. * Measured Boot:: Measuring boot components
  129. +* Lockdown:: Lockdown when booting on a secure setup
  130. @end menu
  131. @node Authentication and authorisation
  132. @@ -5795,6 +5796,13 @@ into @file{core.img} in order to avoid a potential gap in measurement between
  133. Measured boot is currently only supported on EFI platforms.
  134. +@node Lockdown
  135. +@section Lockdown when booting on a secure setup
  136. +
  137. +The GRUB can be locked down when booted on a secure boot environment, for example
  138. +if the UEFI secure boot is enabled. On a locked down configuration, the GRUB will
  139. +be restricted and some operations/commands cannot be executed.
  140. +
  141. @node Platform limitations
  142. @chapter Platform limitations
  143. diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
  144. index cc6fc7d..30e23ad 100644
  145. --- a/grub-core/Makefile.am
  146. +++ b/grub-core/Makefile.am
  147. @@ -80,6 +80,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h
  148. KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
  149. KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
  150. KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
  151. +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lockdown.h
  152. KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
  153. if COND_emu
  154. KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/compiler-rt-emu.h
  155. @@ -377,8 +378,10 @@ command.lst: $(MARKER_FILES)
  156. b=`basename $$pp .marker`; \
  157. sed -n \
  158. -e "/EXTCOMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
  159. + -e "/EXTCOMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
  160. -e "/P1COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
  161. - -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \
  162. + -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" \
  163. + -e "/COMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \
  164. done) | sort -u > $@
  165. platform_DATA += command.lst
  166. CLEANFILES += command.lst
  167. diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am
  168. index 5623a5e..fbfb627 100644
  169. --- a/grub-core/Makefile.core.am
  170. +++ b/grub-core/Makefile.core.am
  171. @@ -22378,7 +22378,7 @@ endif
  172. if COND_i386_efi
  173. platform_PROGRAMS += kernel.exec
  174. kernel_exec_SOURCES = kern/i386/efi/startup.S
  175. -kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  176. +kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  177. nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
  178. kernel_exec_LDADD =
  179. kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL)
  180. @@ -22488,7 +22488,7 @@ endif
  181. if COND_x86_64_efi
  182. platform_PROGRAMS += kernel.exec
  183. kernel_exec_SOURCES = kern/x86_64/efi/startup.S
  184. -kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  185. +kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  186. nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
  187. kernel_exec_LDADD =
  188. kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL)
  189. @@ -22664,7 +22664,7 @@ endif
  190. if COND_ia64_efi
  191. platform_PROGRAMS += kernel.exec
  192. kernel_exec_SOURCES =
  193. -kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  194. +kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  195. nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
  196. kernel_exec_LDADD =
  197. kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -fno-builtin -fpic -minline-int-divide-max-throughput
  198. @@ -22730,7 +22730,7 @@ endif
  199. if COND_arm_efi
  200. platform_PROGRAMS += kernel.exec
  201. kernel_exec_SOURCES = kern/arm/efi/startup.S
  202. -kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  203. +kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  204. nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
  205. kernel_exec_LDADD =
  206. kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL)
  207. @@ -22752,7 +22752,7 @@ endif
  208. if COND_arm64_efi
  209. platform_PROGRAMS += kernel.exec
  210. kernel_exec_SOURCES = kern/arm64/efi/startup.S
  211. -kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  212. +kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  213. nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
  214. kernel_exec_LDADD =
  215. kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL)
  216. @@ -22796,7 +22796,7 @@ endif
  217. if COND_riscv32_efi
  218. platform_PROGRAMS += kernel.exec
  219. kernel_exec_SOURCES = kern/riscv/efi/startup.S
  220. -kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  221. +kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  222. nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
  223. kernel_exec_LDADD =
  224. kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL)
  225. @@ -22818,7 +22818,7 @@ endif
  226. if COND_riscv64_efi
  227. platform_PROGRAMS += kernel.exec
  228. kernel_exec_SOURCES = kern/riscv/efi/startup.S
  229. -kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  230. +kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c
  231. nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources
  232. kernel_exec_LDADD =
  233. kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL)
  234. diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
  235. index 4d380ed..ee8dc55 100644
  236. --- a/grub-core/Makefile.core.def
  237. +++ b/grub-core/Makefile.core.def
  238. @@ -205,6 +205,7 @@ kernel = {
  239. efi = kern/acpi.c;
  240. efi = kern/efi/acpi.c;
  241. efi = kern/efi/sb.c;
  242. + efi = kern/lockdown.c;
  243. i386_coreboot = kern/i386/pc/acpi.c;
  244. i386_multiboot = kern/i386/pc/acpi.c;
  245. i386_coreboot = kern/acpi.c;
  246. diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in
  247. index 09dc802..ac400ea 100644
  248. --- a/grub-core/Makefile.in
  249. +++ b/grub-core/Makefile.in
  250. @@ -10457,13 +10457,14 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
  251. kern/arm64/cache_flush.S kern/arm64/dl.c \
  252. kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c \
  253. kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c \
  254. - kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c \
  255. - kern/time.c kern/generic/millisleep.c kern/command.c \
  256. - kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c \
  257. - kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c \
  258. - kern/misc.c kern/parser.c kern/partition.c \
  259. - kern/rescue_parser.c kern/rescue_reader.c kern/term.c \
  260. - kern/verifiers.c kern/arm/startup.S kern/arm/coreboot/init.c \
  261. + kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c \
  262. + kern/compiler-rt.c kern/mm.c kern/time.c \
  263. + kern/generic/millisleep.c kern/command.c kern/corecmd.c \
  264. + kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \
  265. + kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c \
  266. + kern/parser.c kern/partition.c kern/rescue_parser.c \
  267. + kern/rescue_reader.c kern/term.c kern/verifiers.c \
  268. + kern/arm/startup.S kern/arm/coreboot/init.c \
  269. kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S \
  270. lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c \
  271. term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c \
  272. @@ -10572,6 +10573,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
  273. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \
  274. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \
  275. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \
  276. +@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \
  277. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \
  278. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \
  279. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \
  280. @@ -10646,6 +10648,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
  281. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \
  282. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \
  283. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \
  284. +@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \
  285. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \
  286. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \
  287. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \
  288. @@ -10683,6 +10686,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
  289. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \
  290. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \
  291. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \
  292. +@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \
  293. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \
  294. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \
  295. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \
  296. @@ -10884,6 +10888,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
  297. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \
  298. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \
  299. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \
  300. +@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \
  301. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \
  302. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \
  303. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \
  304. @@ -11120,6 +11125,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
  305. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \
  306. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \
  307. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \
  308. +@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \
  309. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \
  310. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \
  311. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \
  312. @@ -11287,6 +11293,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
  313. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \
  314. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \
  315. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \
  316. +@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \
  317. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \
  318. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \
  319. @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \
  320. @@ -11379,6 +11386,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \
  321. @COND_arm64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \
  322. @COND_arm64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \
  323. @COND_arm64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \
  324. +@COND_arm64_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \
  325. @COND_arm64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \
  326. @COND_arm64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \
  327. @COND_arm64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \
  328. @@ -15379,7 +15387,9 @@ CPPFLAGS_PARTTOOL_LIST = -Dgrub_parttool_register=PARTTOOL_LIST_MARKER
  329. CPPFLAGS_TERMINAL_LIST = '-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' \
  330. '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)'
  331. CPPFLAGS_COMMAND_LIST = '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)' \
  332. + '-Dgrub_register_command_lockdown(...)=COMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' \
  333. '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)' \
  334. + '-Dgrub_register_extcmd_lockdown(...)=EXTCOMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' \
  335. '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)'
  336. CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)'
  337. CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \
  338. @@ -16387,6 +16397,7 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \
  339. $(top_srcdir)/include/grub/i18n.h \
  340. $(top_srcdir)/include/grub/kernel.h \
  341. $(top_srcdir)/include/grub/list.h \
  342. + $(top_srcdir)/include/grub/lockdown.h \
  343. $(top_srcdir)/include/grub/misc.h $(am__append_5794) \
  344. $(am__append_5795) $(top_srcdir)/include/grub/mm.h \
  345. $(top_srcdir)/include/grub/parser.h \
  346. @@ -25594,7 +25605,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
  347. @COND_arm64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \
  348. @COND_arm64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \
  349. @COND_arm64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \
  350. -@COND_arm64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \
  351. +@COND_arm64_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \
  352. +@COND_arm64_efi_TRUE@ kern/mm.c kern/time.c \
  353. @COND_arm64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \
  354. @COND_arm64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \
  355. @COND_arm64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \
  356. @@ -25645,7 +25657,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
  357. @COND_arm_efi_TRUE@ kern/efi/init.c kern/efi/mm.c \
  358. @COND_arm_efi_TRUE@ term/efi/console.c kern/acpi.c \
  359. @COND_arm_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \
  360. -@COND_arm_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \
  361. +@COND_arm_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \
  362. +@COND_arm_efi_TRUE@ kern/mm.c kern/time.c \
  363. @COND_arm_efi_TRUE@ kern/generic/millisleep.c kern/command.c \
  364. @COND_arm_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \
  365. @COND_arm_efi_TRUE@ kern/dl.c kern/env.c kern/err.c kern/file.c \
  366. @@ -25725,7 +25738,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
  367. @COND_i386_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \
  368. @COND_i386_efi_TRUE@ kern/efi/mm.c term/efi/console.c \
  369. @COND_i386_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \
  370. -@COND_i386_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \
  371. +@COND_i386_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \
  372. +@COND_i386_efi_TRUE@ kern/mm.c kern/time.c \
  373. @COND_i386_efi_TRUE@ kern/generic/millisleep.c kern/command.c \
  374. @COND_i386_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \
  375. @COND_i386_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \
  376. @@ -25843,7 +25857,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
  377. @COND_ia64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \
  378. @COND_ia64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \
  379. @COND_ia64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \
  380. -@COND_ia64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \
  381. +@COND_ia64_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \
  382. +@COND_ia64_efi_TRUE@ kern/mm.c kern/time.c \
  383. @COND_ia64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \
  384. @COND_ia64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \
  385. @COND_ia64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \
  386. @@ -25956,8 +25971,9 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
  387. @COND_riscv32_efi_TRUE@ kern/efi/init.c kern/efi/mm.c \
  388. @COND_riscv32_efi_TRUE@ term/efi/console.c kern/acpi.c \
  389. @COND_riscv32_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \
  390. -@COND_riscv32_efi_TRUE@ kern/compiler-rt.c kern/mm.c \
  391. -@COND_riscv32_efi_TRUE@ kern/time.c kern/generic/millisleep.c \
  392. +@COND_riscv32_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \
  393. +@COND_riscv32_efi_TRUE@ kern/mm.c kern/time.c \
  394. +@COND_riscv32_efi_TRUE@ kern/generic/millisleep.c \
  395. @COND_riscv32_efi_TRUE@ kern/command.c kern/corecmd.c \
  396. @COND_riscv32_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \
  397. @COND_riscv32_efi_TRUE@ kern/env.c kern/err.c kern/file.c \
  398. @@ -25974,9 +25990,9 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
  399. @COND_riscv64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \
  400. @COND_riscv64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \
  401. @COND_riscv64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \
  402. -@COND_riscv64_efi_TRUE@ kern/efi/sb.c kern/compiler-rt.c \
  403. -@COND_riscv64_efi_TRUE@ kern/mm.c kern/time.c \
  404. -@COND_riscv64_efi_TRUE@ kern/generic/millisleep.c \
  405. +@COND_riscv64_efi_TRUE@ kern/efi/sb.c kern/lockdown.c \
  406. +@COND_riscv64_efi_TRUE@ kern/compiler-rt.c kern/mm.c \
  407. +@COND_riscv64_efi_TRUE@ kern/time.c kern/generic/millisleep.c \
  408. @COND_riscv64_efi_TRUE@ kern/command.c kern/corecmd.c \
  409. @COND_riscv64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \
  410. @COND_riscv64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \
  411. @@ -26022,8 +26038,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
  412. @COND_x86_64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \
  413. @COND_x86_64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \
  414. @COND_x86_64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \
  415. -@COND_x86_64_efi_TRUE@ kern/efi/sb.c kern/compiler-rt.c \
  416. -@COND_x86_64_efi_TRUE@ kern/mm.c kern/time.c \
  417. +@COND_x86_64_efi_TRUE@ kern/efi/sb.c kern/lockdown.c \
  418. +@COND_x86_64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \
  419. @COND_x86_64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \
  420. @COND_x86_64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \
  421. @COND_x86_64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \
  422. @@ -27994,6 +28010,8 @@ kern/efi/kernel_exec-acpi.$(OBJEXT): kern/efi/$(am__dirstamp) \
  423. kern/efi/$(DEPDIR)/$(am__dirstamp)
  424. kern/efi/kernel_exec-sb.$(OBJEXT): kern/efi/$(am__dirstamp) \
  425. kern/efi/$(DEPDIR)/$(am__dirstamp)
  426. +kern/kernel_exec-lockdown.$(OBJEXT): kern/$(am__dirstamp) \
  427. + kern/$(DEPDIR)/$(am__dirstamp)
  428. kern/kernel_exec-compiler-rt.$(OBJEXT): kern/$(am__dirstamp) \
  429. kern/$(DEPDIR)/$(am__dirstamp)
  430. kern/kernel_exec-mm.$(OBJEXT): kern/$(am__dirstamp) \
  431. @@ -30945,6 +30963,7 @@ distclean-compile:
  432. @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-file.Po@am__quote@
  433. @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-fs.Po@am__quote@
  434. @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-list.Po@am__quote@
  435. +@AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-lockdown.Po@am__quote@
  436. @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-main.Po@am__quote@
  437. @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-misc.Po@am__quote@
  438. @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-mm.Po@am__quote@
  439. @@ -35293,6 +35312,20 @@ kern/efi/kernel_exec-sb.obj: kern/efi/sb.c
  440. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  441. @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/efi/kernel_exec-sb.obj `if test -f 'kern/efi/sb.c'; then $(CYGPATH_W) 'kern/efi/sb.c'; else $(CYGPATH_W) '$(srcdir)/kern/efi/sb.c'; fi`
  442. +kern/kernel_exec-lockdown.o: kern/lockdown.c
  443. +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-lockdown.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-lockdown.Tpo -c -o kern/kernel_exec-lockdown.o `test -f 'kern/lockdown.c' || echo '$(srcdir)/'`kern/lockdown.c
  444. +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-lockdown.Tpo kern/$(DEPDIR)/kernel_exec-lockdown.Po
  445. +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/lockdown.c' object='kern/kernel_exec-lockdown.o' libtool=no @AMDEPBACKSLASH@
  446. +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  447. +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-lockdown.o `test -f 'kern/lockdown.c' || echo '$(srcdir)/'`kern/lockdown.c
  448. +
  449. +kern/kernel_exec-lockdown.obj: kern/lockdown.c
  450. +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-lockdown.obj -MD -MP -MF kern/$(DEPDIR)/kernel_exec-lockdown.Tpo -c -o kern/kernel_exec-lockdown.obj `if test -f 'kern/lockdown.c'; then $(CYGPATH_W) 'kern/lockdown.c'; else $(CYGPATH_W) '$(srcdir)/kern/lockdown.c'; fi`
  451. +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-lockdown.Tpo kern/$(DEPDIR)/kernel_exec-lockdown.Po
  452. +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/lockdown.c' object='kern/kernel_exec-lockdown.obj' libtool=no @AMDEPBACKSLASH@
  453. +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  454. +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-lockdown.obj `if test -f 'kern/lockdown.c'; then $(CYGPATH_W) 'kern/lockdown.c'; else $(CYGPATH_W) '$(srcdir)/kern/lockdown.c'; fi`
  455. +
  456. kern/kernel_exec-compiler-rt.o: kern/compiler-rt.c
  457. @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-compiler-rt.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-compiler-rt.Tpo -c -o kern/kernel_exec-compiler-rt.o `test -f 'kern/compiler-rt.c' || echo '$(srcdir)/'`kern/compiler-rt.c
  458. @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-compiler-rt.Tpo kern/$(DEPDIR)/kernel_exec-compiler-rt.Po
  459. @@ -46650,8 +46683,10 @@ command.lst: $(MARKER_FILES)
  460. b=`basename $$pp .marker`; \
  461. sed -n \
  462. -e "/EXTCOMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
  463. + -e "/EXTCOMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
  464. -e "/P1COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
  465. - -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \
  466. + -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" \
  467. + -e "/COMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \
  468. done) | sort -u > $@
  469. partmap.lst: $(MARKER_FILES)
  470. diff --git a/grub-core/commands/extcmd.c b/grub-core/commands/extcmd.c
  471. index 69574e2..90a5ca2 100644
  472. --- a/grub-core/commands/extcmd.c
  473. +++ b/grub-core/commands/extcmd.c
  474. @@ -19,6 +19,7 @@
  475. #include <grub/mm.h>
  476. #include <grub/list.h>
  477. +#include <grub/lockdown.h>
  478. #include <grub/misc.h>
  479. #include <grub/extcmd.h>
  480. #include <grub/script_sh.h>
  481. @@ -110,6 +111,28 @@ grub_register_extcmd (const char *name, grub_extcmd_func_t func,
  482. summary, description, parser, 1);
  483. }
  484. +static grub_err_t
  485. +grub_extcmd_lockdown (grub_extcmd_context_t ctxt __attribute__ ((unused)),
  486. + int argc __attribute__ ((unused)),
  487. + char **argv __attribute__ ((unused)))
  488. +{
  489. + return grub_error (GRUB_ERR_ACCESS_DENIED,
  490. + N_("%s: the command is not allowed when lockdown is enforced"),
  491. + ctxt->extcmd->cmd->name);
  492. +}
  493. +
  494. +grub_extcmd_t
  495. +grub_register_extcmd_lockdown (const char *name, grub_extcmd_func_t func,
  496. + grub_command_flags_t flags, const char *summary,
  497. + const char *description,
  498. + const struct grub_arg_option *parser)
  499. +{
  500. + if (grub_is_lockdown () == GRUB_LOCKDOWN_ENABLED)
  501. + func = grub_extcmd_lockdown;
  502. +
  503. + return grub_register_extcmd (name, func, flags, summary, description, parser);
  504. +}
  505. +
  506. void
  507. grub_unregister_extcmd (grub_extcmd_t ext)
  508. {
  509. diff --git a/grub-core/kern/command.c b/grub-core/kern/command.c
  510. index acd7218..4aabcd4 100644
  511. --- a/grub-core/kern/command.c
  512. +++ b/grub-core/kern/command.c
  513. @@ -17,6 +17,7 @@
  514. * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
  515. */
  516. +#include <grub/lockdown.h>
  517. #include <grub/mm.h>
  518. #include <grub/command.h>
  519. @@ -77,6 +78,29 @@ grub_register_command_prio (const char *name,
  520. return cmd;
  521. }
  522. +static grub_err_t
  523. +grub_cmd_lockdown (grub_command_t cmd __attribute__ ((unused)),
  524. + int argc __attribute__ ((unused)),
  525. + char **argv __attribute__ ((unused)))
  526. +
  527. +{
  528. + return grub_error (GRUB_ERR_ACCESS_DENIED,
  529. + N_("%s: the command is not allowed when lockdown is enforced"),
  530. + cmd->name);
  531. +}
  532. +
  533. +grub_command_t
  534. +grub_register_command_lockdown (const char *name,
  535. + grub_command_func_t func,
  536. + const char *summary,
  537. + const char *description)
  538. +{
  539. + if (grub_is_lockdown () == GRUB_LOCKDOWN_ENABLED)
  540. + func = grub_cmd_lockdown;
  541. +
  542. + return grub_register_command_prio (name, func, summary, description, 0);
  543. +}
  544. +
  545. void
  546. grub_unregister_command (grub_command_t cmd)
  547. {
  548. diff --git a/grub-core/kern/lockdown.c b/grub-core/kern/lockdown.c
  549. new file mode 100644
  550. index 0000000..1e56c0b
  551. --- /dev/null
  552. +++ b/grub-core/kern/lockdown.c
  553. @@ -0,0 +1,80 @@
  554. +/*
  555. + * GRUB -- GRand Unified Bootloader
  556. + * Copyright (C) 2020 Free Software Foundation, Inc.
  557. + *
  558. + * GRUB is free software: you can redistribute it and/or modify
  559. + * it under the terms of the GNU General Public License as published by
  560. + * the Free Software Foundation, either version 3 of the License, or
  561. + * (at your option) any later version.
  562. + *
  563. + * GRUB is distributed in the hope that it will be useful,
  564. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  565. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  566. + * GNU General Public License for more details.
  567. + *
  568. + * You should have received a copy of the GNU General Public License
  569. + * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
  570. + *
  571. + */
  572. +
  573. +#include <grub/dl.h>
  574. +#include <grub/file.h>
  575. +#include <grub/lockdown.h>
  576. +#include <grub/verify.h>
  577. +
  578. +static int lockdown = GRUB_LOCKDOWN_DISABLED;
  579. +
  580. +static grub_err_t
  581. +lockdown_verifier_init (grub_file_t io __attribute__ ((unused)),
  582. + enum grub_file_type type,
  583. + void **context __attribute__ ((unused)),
  584. + enum grub_verify_flags *flags)
  585. +{
  586. + *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION;
  587. +
  588. + switch (type & GRUB_FILE_TYPE_MASK)
  589. + {
  590. + case GRUB_FILE_TYPE_GRUB_MODULE:
  591. + case GRUB_FILE_TYPE_LINUX_KERNEL:
  592. + case GRUB_FILE_TYPE_MULTIBOOT_KERNEL:
  593. + case GRUB_FILE_TYPE_XEN_HYPERVISOR:
  594. + case GRUB_FILE_TYPE_BSD_KERNEL:
  595. + case GRUB_FILE_TYPE_XNU_KERNEL:
  596. + case GRUB_FILE_TYPE_PLAN9_KERNEL:
  597. + case GRUB_FILE_TYPE_NTLDR:
  598. + case GRUB_FILE_TYPE_TRUECRYPT:
  599. + case GRUB_FILE_TYPE_FREEDOS:
  600. + case GRUB_FILE_TYPE_PXECHAINLOADER:
  601. + case GRUB_FILE_TYPE_PCCHAINLOADER:
  602. + case GRUB_FILE_TYPE_COREBOOT_CHAINLOADER:
  603. + case GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE:
  604. + case GRUB_FILE_TYPE_ACPI_TABLE:
  605. + case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE:
  606. + *flags = GRUB_VERIFY_FLAGS_DEFER_AUTH;
  607. +
  608. + /* Fall through. */
  609. +
  610. + default:
  611. + return GRUB_ERR_NONE;
  612. + }
  613. +}
  614. +
  615. +struct grub_file_verifier lockdown_verifier =
  616. + {
  617. + .name = "lockdown_verifier",
  618. + .init = lockdown_verifier_init,
  619. + };
  620. +
  621. +void
  622. +grub_lockdown (void)
  623. +{
  624. + lockdown = GRUB_LOCKDOWN_ENABLED;
  625. +
  626. + grub_verifier_register (&lockdown_verifier);
  627. +}
  628. +
  629. +int
  630. +grub_is_lockdown (void)
  631. +{
  632. + return lockdown;
  633. +}
  634. diff --git a/include/grub/command.h b/include/grub/command.h
  635. index eee4e84..2a6f7f8 100644
  636. --- a/include/grub/command.h
  637. +++ b/include/grub/command.h
  638. @@ -86,6 +86,11 @@ EXPORT_FUNC(grub_register_command_prio) (const char *name,
  639. const char *summary,
  640. const char *description,
  641. int prio);
  642. +grub_command_t
  643. +EXPORT_FUNC(grub_register_command_lockdown) (const char *name,
  644. + grub_command_func_t func,
  645. + const char *summary,
  646. + const char *description);
  647. void EXPORT_FUNC(grub_unregister_command) (grub_command_t cmd);
  648. static inline grub_command_t
  649. diff --git a/include/grub/extcmd.h b/include/grub/extcmd.h
  650. index 19fe592..fe9248b 100644
  651. --- a/include/grub/extcmd.h
  652. +++ b/include/grub/extcmd.h
  653. @@ -62,6 +62,13 @@ grub_extcmd_t EXPORT_FUNC(grub_register_extcmd) (const char *name,
  654. const char *description,
  655. const struct grub_arg_option *parser);
  656. +grub_extcmd_t EXPORT_FUNC(grub_register_extcmd_lockdown) (const char *name,
  657. + grub_extcmd_func_t func,
  658. + grub_command_flags_t flags,
  659. + const char *summary,
  660. + const char *description,
  661. + const struct grub_arg_option *parser);
  662. +
  663. grub_extcmd_t EXPORT_FUNC(grub_register_extcmd_prio) (const char *name,
  664. grub_extcmd_func_t func,
  665. grub_command_flags_t flags,
  666. diff --git a/include/grub/lockdown.h b/include/grub/lockdown.h
  667. new file mode 100644
  668. index 0000000..40531fa
  669. --- /dev/null
  670. +++ b/include/grub/lockdown.h
  671. @@ -0,0 +1,44 @@
  672. +/*
  673. + * GRUB -- GRand Unified Bootloader
  674. + * Copyright (C) 2020 Free Software Foundation, Inc.
  675. + *
  676. + * GRUB is free software: you can redistribute it and/or modify
  677. + * it under the terms of the GNU General Public License as published by
  678. + * the Free Software Foundation, either version 3 of the License, or
  679. + * (at your option) any later version.
  680. + *
  681. + * GRUB is distributed in the hope that it will be useful,
  682. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  683. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  684. + * GNU General Public License for more details.
  685. + *
  686. + * You should have received a copy of the GNU General Public License
  687. + * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
  688. + */
  689. +
  690. +#ifndef GRUB_LOCKDOWN_H
  691. +#define GRUB_LOCKDOWN_H 1
  692. +
  693. +#include <grub/symbol.h>
  694. +
  695. +#define GRUB_LOCKDOWN_DISABLED 0
  696. +#define GRUB_LOCKDOWN_ENABLED 1
  697. +
  698. +#ifdef GRUB_MACHINE_EFI
  699. +extern void
  700. +EXPORT_FUNC (grub_lockdown) (void);
  701. +extern int
  702. +EXPORT_FUNC (grub_is_lockdown) (void);
  703. +#else
  704. +static inline void
  705. +grub_lockdown (void)
  706. +{
  707. +}
  708. +
  709. +static inline int
  710. +grub_is_lockdown (void)
  711. +{
  712. + return GRUB_LOCKDOWN_DISABLED;
  713. +}
  714. +#endif
  715. +#endif /* ! GRUB_LOCKDOWN_H */
  716. diff --git a/po/POTFILES.in b/po/POTFILES.in
  717. index 49755d3..5e26845 100644
  718. --- a/po/POTFILES.in
  719. +++ b/po/POTFILES.in
  720. @@ -309,6 +309,7 @@
  721. ./grub-core/kern/ieee1275/mmap.c
  722. ./grub-core/kern/ieee1275/openfw.c
  723. ./grub-core/kern/list.c
  724. +./grub-core/kern/lockdown.c
  725. ./grub-core/kern/main.c
  726. ./grub-core/kern/mips/arc/init.c
  727. ./grub-core/kern/mips/dl.c
  728. @@ -1207,6 +1208,7 @@
  729. ./include/grub/linux.h
  730. ./include/grub/list.h
  731. ./include/grub/loader.h
  732. +./include/grub/lockdown.h
  733. ./include/grub/lvm.h
  734. ./include/grub/macho.h
  735. ./include/grub/machoload.h
  736. --
  737. 2.14.2