| From 3a37bf120a9194c373257c70175cdb5b337bc107 Mon Sep 17 00:00:00 2001 |
| From: Darren Kenny <darren.kenny@oracle.com> |
| Date: Wed, 28 Oct 2020 14:43:01 +0000 |
| Subject: [PATCH] gnulib/argp-help: Fix dereference of a possibly NULL state |
| |
| All other instances of call to __argp_failure() where there is |
| a dgettext() call is first checking whether state is NULL before |
| attempting to dereference it to get the root_argp->argp_domain. |
| |
| Fixes: CID 292436 |
| |
| Signed-off-by: Darren Kenny <darren.kenny@oracle.com> |
| Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> |
| [Add changes to generated files] |
| Signed-off-by: Stefan SΓΈrensen <stefan.sorensen@spectralink.com> |
| --- |
| Makefile.in | 1 + |
| conf/Makefile.extra-dist | 1 + |
| grub-core/lib/gnulib-patches/fix-null-state-deref.patch | 12 ++++++++++++ |
| grub-core/lib/gnulib/argp-help.c | 3 ++- |
| 4 files changed, 16 insertions(+), 1 deletion(-) |
| create mode 100644 grub-core/lib/gnulib-patches/fix-null-state-deref.patch |
| |
| diff --git a/Makefile.in b/Makefile.in |
| index d58a7d7..812b7c2 100644 |
| --- a/Makefile.in |
| +++ b/Makefile.in |
| @@ -2742,6 +2742,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \ |
| grub-core/gensyminfo.sh.in grub-core/gensymlist.sh \ |
| grub-core/genemuinit.sh grub-core/genemuinitheader.sh \ |
| grub-core/lib/gnulib-patches/fix-null-deref.patch \ |
| + grub-core/lib/gnulib-patches/fix-null-state-deref.patch \ |
| grub-core/lib/gnulib-patches/fix-uninit-structure.patch \ |
| grub-core/lib/gnulib-patches/fix-unused-value.patch \ |
| grub-core/lib/gnulib-patches/fix-width.patch \ |
| diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist |
| index 9e55458..96d7e69 100644 |
| --- a/conf/Makefile.extra-dist |
| +++ b/conf/Makefile.extra-dist |
| @@ -29,6 +29,7 @@ EXTRA_DIST += grub-core/genemuinit.sh |
| EXTRA_DIST += grub-core/genemuinitheader.sh |
| |
| EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch |
| +EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch |
| EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch |
| EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch |
| EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch |
| diff --git a/grub-core/lib/gnulib-patches/fix-null-state-deref.patch b/grub-core/lib/gnulib-patches/fix-null-state-deref.patch |
| new file mode 100644 |
| index 0000000..813ec09 |
| --- /dev/null |
| +++ b/grub-core/lib/gnulib-patches/fix-null-state-deref.patch |
| @@ -0,0 +1,12 @@ |
| +--- a/lib/argp-help.c 2020-10-28 14:32:19.189215988 +0000 |
| ++++ b/lib/argp-help.c 2020-10-28 14:38:21.204673940 +0000 |
| +@@ -145,7 +145,8 @@ |
| + if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin) |
| + { |
| + __argp_failure (state, 0, 0, |
| +- dgettext (state->root_argp->argp_domain, |
| ++ dgettext (state == NULL ? NULL |
| ++ : state->root_argp->argp_domain, |
| + "\ |
| + ARGP_HELP_FMT: %s value is less than or equal to %s"), |
| + "rmargin", up->name); |
| diff --git a/grub-core/lib/gnulib/argp-help.c b/grub-core/lib/gnulib/argp-help.c |
| index 5d8f451..c75568c 100644 |
| --- a/grub-core/lib/gnulib/argp-help.c |
| +++ b/grub-core/lib/gnulib/argp-help.c |
| @@ -145,7 +145,8 @@ validate_uparams (const struct argp_state *state, struct uparams *upptr) |
| if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin) |
| { |
| __argp_failure (state, 0, 0, |
| - dgettext (state->root_argp->argp_domain, |
| + dgettext (state == NULL ? NULL |
| + : state->root_argp->argp_domain, |
| "\ |
| ARGP_HELP_FMT: %s value is less than or equal to %s"), |
| "rmargin", up->name); |
| -- |
| 2.14.2 |
| |
