Merge ~juliank/grub/+git/ubuntu:ubuntu into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Julian Andres Klode]

[Julian Andres Klode (juliank)]

This goes into signed grub image and is needed for OEM work.

[Dimitri John Ledkov (xnox)]

One could have implemented the filtering without a new memory allocation; but that has been discussed on the upstream mailing list and this implementation is more trivial.

review: Approve

[Chris Coulson (chrisccoulson)]

This looks ok to me.

review: Approve

[Seth Arnold (seth-arnold)]

I've marked a spot where a char comparison may not necessarily be useful on systems with signed-by-default chars like the s390. Does this code ever run on any of those architectures?

Thanks

[Dimitri John Ledkov (xnox)]

No, s390x does not use grub. It uses zipl (z itial program load).

PowerPC uses prep partitions & petiboot.

Some armhf, arm64, riscv64 use grub.

Amd64 uses grub.

i386 is dead to us.

On Wed, 11 Mar 2020, 17:00 Seth Arnold, <email address hidden> wrote:

> I've marked a spot where a char comparison may not necessarily be useful
> on systems with signed-by-default chars like the s390. Does this code ever
> run on any of those architectures?
>
> Thanks
>
> Diff comments:
>
> > diff --git
> a/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
> b/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
> > new file mode 100644
> > index 0000000..f656509
> > --- /dev/null
> > +++
> b/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
> > @@ -0,0 +1,86 @@
> > +From 79d4ae1df7b63ef106a85ad18bfedb6d709ef29a Mon Sep 17 00:00:00 2001
> > +From: Julian Andres Klode <email address hidden>
> > +Date: Tue, 3 Mar 2020 16:06:34 +0100
> > +Subject: smbios: Add a --linux argument to apply linux modalias-like
> filtering
> > +
> > +Linux creates modalias strings by filtering out non-ASCII, space,
> > +and colon characters. Provide an option that does the same filtering
> > +so people can create a modalias string in GRUB, and then match their
> > +modalias patterns against it.
> > +
> > +Signed-off-by: Julian Andres Klode <email address hidden>
> > +Reviewed-by: Daniel Kiper <email address hidden>
> > +Origin: upstream,
> https://git.savannah.gnu.org/cgit/grub.git/commit/?id=87049f9716fb095aecb595fb8f45497bbbb1b4a2
> > +---
> > + grub-core/commands/smbios.c | 24 ++++++++++++++++++++++++
> > + 1 file changed, 24 insertions(+)
> > +
> > +diff --git a/grub-core/commands/smbios.c b/grub-core/commands/smbios.c
> > +index 7a6a391fc..1a9086ddd 100644
> > +--- a/grub-core/commands/smbios.c
> > ++++ b/grub-core/commands/smbios.c
> > +@@ -64,6 +64,21 @@ grub_smbios_get_eps3 (void)
> > + return eps;
> > + }
> > +
> > ++static char *
> > ++linux_string (const char *value)
> > ++{
> > ++ char *out = grub_malloc( grub_strlen (value) + 1);
> > ++ const char *src = value;
> > ++ char *dst = out;
> > ++
> > ++ for (; *src; src++)
> > ++ if (*src > ' ' && *src < 127 && *src != ':')
>
> Is grub ever used on architectures with signed-by-default chars like
> s390x? (Are there others?)
>
> > ++ *dst++ = *src;
> > ++
> > ++ *dst = 0;
> > ++ return out;
> > ++}
> > ++
> > + /*
> > + * These functions convert values from the various SMBIOS structure
> field types
> > + * into a string formatted to be returned to the user. They expect
> that the
> > +@@ -176,6 +191,7 @@ static const struct {
> > + /* List command options, with structure field getters ordered as
> above. */
> > + #define FIRST_GETTER_OPT (3)
> > + #define SETTER_OPT (FIRST_GETTER_OPT + ARRAY_SIZE(field_extractors))
> > ++#define LINUX_OPT (FIRST_GETTER_OPT + ARRAY_SIZE(field_extractors) + 1)
> > +
> > + static const struct grub_arg_option options[] = {
> > + {"type", 't', 0, N_("Match structures with the given type."),
> > +@@ -198,6 +214,8 @@ static const struct grub_arg_option options[] = {
> >...

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 77b21d2..89761e2 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-3fd849d69e8213885f3fe4b6ad88cf6a41a7b863
-3fd849d69e8213885f3fe4b6ad88cf6a41a7b863
+79d4ae1df7b63ef106a85ad18bfedb6d709ef29a
+79d4ae1df7b63ef106a85ad18bfedb6d709ef29a
 578bb115fbd47e1c464696f1f8d6183e5443975d
 578bb115fbd47e1c464696f1f8d6183e5443975d
 grub2_2.04.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index e36f7a8..aa3f194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grub2 (2.04-1ubuntu22) UNRELEASED; urgency=medium
+
+  * smbios: Add a --linux argument to apply linux modalias-like filtering
+
+ -- Julian Andres Klode <[e-mail]>  Wed, 11 Mar 2020 14:16:40 +0100
+
 grub2 (2.04-1ubuntu21) focal; urgency=medium
 
   * Make ZFS menu generation depending on new zsysd binary instead of eoan
diff --git a/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch b/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
new file mode 100644
index 0000000..f656509
--- /dev/null
+++ b/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
@@ -0,0 +1,86 @@
+From 79d4ae1df7b63ef106a85ad18bfedb6d709ef29a Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <[e-mail]>
+Date: Tue, 3 Mar 2020 16:06:34 +0100
+Subject: smbios: Add a --linux argument to apply linux modalias-like filtering
+
+Linux creates modalias strings by filtering out non-ASCII, space,
+and colon characters. Provide an option that does the same filtering
+so people can create a modalias string in GRUB, and then match their
+modalias patterns against it.
+
+Signed-off-by: Julian Andres Klode <[e-mail]>
+Reviewed-by: Daniel Kiper <[e-mail]>
+Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=87049f9716fb095aecb595fb8f45497bbbb1b4a2
+---
+ grub-core/commands/smbios.c | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/grub-core/commands/smbios.c b/grub-core/commands/smbios.c
+index 7a6a391fc..1a9086ddd 100644
+--- a/grub-core/commands/smbios.c
++++ b/grub-core/commands/smbios.c
+@@ -64,6 +64,21 @@ grub_smbios_get_eps3 (void)
+   return eps;
+ }
+ 
++static char *
++linux_string (const char *value)
++{
++  char *out = grub_malloc( grub_strlen (value) + 1);
++  const char *src = value;
++  char *dst = out;
++
++  for (; *src; src++)
++    if (*src > ' ' && *src < 127 && *src != ':')
++      *dst++ = *src;
++
++  *dst = 0;
++  return out;
++}
++
+ /*
+  * These functions convert values from the various SMBIOS structure field types
+  * into a string formatted to be returned to the user.  They expect that the
+@@ -176,6 +191,7 @@ static const struct {
+ /* List command options, with structure field getters ordered as above. */
+ #define FIRST_GETTER_OPT (3)
+ #define SETTER_OPT (FIRST_GETTER_OPT + ARRAY_SIZE(field_extractors))
++#define LINUX_OPT (FIRST_GETTER_OPT + ARRAY_SIZE(field_extractors) + 1)
+ 
+ static const struct grub_arg_option options[] = {
+   {"type",       't', 0, N_("Match structures with the given type."),
+@@ -198,6 +214,8 @@ static const struct grub_arg_option options[] = {
+                          N_("offset"), ARG_TYPE_INT},
+   {"set",       '\0', 0, N_("Store the value in the given variable name."),
+                          N_("variable"), ARG_TYPE_STRING},
++  {"linux",     '\0', 0, N_("Filter the result like linux does."),
++                         N_("variable"), ARG_TYPE_NONE},
+   {0, 0, 0, 0, 0, 0}
+ };
+ 
+@@ -261,6 +279,7 @@ grub_cmd_smbios (grub_extcmd_context_t ctxt,
+ 
+   const grub_uint8_t *structure;
+   const char *value;
++  char *modified_value = NULL;
+   grub_int32_t option;
+   grub_int8_t field_type = -1;
+   grub_uint8_t i;
+@@ -334,12 +353,17 @@ grub_cmd_smbios (grub_extcmd_context_t ctxt,
+     return grub_error (GRUB_ERR_IO,
+                        N_("failed to retrieve the structure field"));
+ 
++  if (state[LINUX_OPT].set)
++    value = modified_value = linux_string (value);
++
+   /* Store or print the formatted value. */
+   if (state[SETTER_OPT].set)
+     grub_env_set (state[SETTER_OPT].arg, value);
+   else
+     grub_printf ("%s\n", value);
+ 
++  grub_free(modified_value);
++
+   return GRUB_ERR_NONE;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index bb417c4..4666699 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -73,3 +73,4 @@ cherrypick-lsefisystab-define-smbios3.patch
 cherrypick-smbios-module.patch
 cherrypick-lsefisystab-show-dtb.patch
 0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
+0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
diff --git a/grub-core/commands/smbios.c b/grub-core/commands/smbios.c
index 7a6a391..1a9086d 100644
--- a/grub-core/commands/smbios.c
+++ b/grub-core/commands/smbios.c
@@ -64,6 +64,21 @@ grub_smbios_get_eps3 (void)
   return eps;
 }
 
+static char *
+linux_string (const char *value)
+{
+  char *out = grub_malloc( grub_strlen (value) + 1);
+  const char *src = value;
+  char *dst = out;
+
+  for (; *src; src++)
+    if (*src > ' ' && *src < 127 && *src != ':')
+      *dst++ = *src;
+
+  *dst = 0;
+  return out;
+}
+
 /*
  * These functions convert values from the various SMBIOS structure field types
  * into a string formatted to be returned to the user.  They expect that the
@@ -176,6 +191,7 @@ static const struct {
 /* List command options, with structure field getters ordered as above. */
 #define FIRST_GETTER_OPT (3)
 #define SETTER_OPT (FIRST_GETTER_OPT + ARRAY_SIZE(field_extractors))
+#define LINUX_OPT (FIRST_GETTER_OPT + ARRAY_SIZE(field_extractors) + 1)
 
 static const struct grub_arg_option options[] = {
   {"type",       't', 0, N_("Match structures with the given type."),
@@ -198,6 +214,8 @@ static const struct grub_arg_option options[] = {
                          N_("offset"), ARG_TYPE_INT},
   {"set",       '\0', 0, N_("Store the value in the given variable name."),
                          N_("variable"), ARG_TYPE_STRING},
+  {"linux",     '\0', 0, N_("Filter the result like linux does."),
+                         N_("variable"), ARG_TYPE_NONE},
   {0, 0, 0, 0, 0, 0}
 };
 
@@ -261,6 +279,7 @@ grub_cmd_smbios (grub_extcmd_context_t ctxt,
 
   const grub_uint8_t *structure;
   const char *value;
+  char *modified_value = NULL;
   grub_int32_t option;
   grub_int8_t field_type = -1;
   grub_uint8_t i;
@@ -334,12 +353,17 @@ grub_cmd_smbios (grub_extcmd_context_t ctxt,
     return grub_error (GRUB_ERR_IO,
                        N_("failed to retrieve the structure field"));
 
+  if (state[LINUX_OPT].set)
+    value = modified_value = linux_string (value);
+
   /* Store or print the formatted value. */
   if (state[SETTER_OPT].set)
     grub_env_set (state[SETTER_OPT].arg, value);
   else
     grub_printf ("%s\n", value);
 
+  grub_free(modified_value);
+
   return GRUB_ERR_NONE;
 }