0057-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch 3.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182
  1. From 3a37bf120a9194c373257c70175cdb5b337bc107 Mon Sep 17 00:00:00 2001
  2. From: Darren Kenny <darren.kenny@oracle.com>
  3. Date: Wed, 28 Oct 2020 14:43:01 +0000
  4. Subject: [PATCH] gnulib/argp-help: Fix dereference of a possibly NULL state
  5. All other instances of call to __argp_failure() where there is
  6. a dgettext() call is first checking whether state is NULL before
  7. attempting to dereference it to get the root_argp->argp_domain.
  8. Fixes: CID 292436
  9. Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
  10. Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
  11. [Add changes to generated files]
  12. Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
  13. ---
  14. Makefile.in | 1 +
  15. conf/Makefile.extra-dist | 1 +
  16. grub-core/lib/gnulib-patches/fix-null-state-deref.patch | 12 ++++++++++++
  17. grub-core/lib/gnulib/argp-help.c | 3 ++-
  18. 4 files changed, 16 insertions(+), 1 deletion(-)
  19. create mode 100644 grub-core/lib/gnulib-patches/fix-null-state-deref.patch
  20. diff --git a/Makefile.in b/Makefile.in
  21. index d58a7d7..812b7c2 100644
  22. --- a/Makefile.in
  23. +++ b/Makefile.in
  24. @@ -2742,6 +2742,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \
  25. grub-core/gensyminfo.sh.in grub-core/gensymlist.sh \
  26. grub-core/genemuinit.sh grub-core/genemuinitheader.sh \
  27. grub-core/lib/gnulib-patches/fix-null-deref.patch \
  28. + grub-core/lib/gnulib-patches/fix-null-state-deref.patch \
  29. grub-core/lib/gnulib-patches/fix-uninit-structure.patch \
  30. grub-core/lib/gnulib-patches/fix-unused-value.patch \
  31. grub-core/lib/gnulib-patches/fix-width.patch \
  32. diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
  33. index 9e55458..96d7e69 100644
  34. --- a/conf/Makefile.extra-dist
  35. +++ b/conf/Makefile.extra-dist
  36. @@ -29,6 +29,7 @@ EXTRA_DIST += grub-core/genemuinit.sh
  37. EXTRA_DIST += grub-core/genemuinitheader.sh
  38. EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch
  39. +EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch
  40. EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch
  41. EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch
  42. EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch
  43. diff --git a/grub-core/lib/gnulib-patches/fix-null-state-deref.patch b/grub-core/lib/gnulib-patches/fix-null-state-deref.patch
  44. new file mode 100644
  45. index 0000000..813ec09
  46. --- /dev/null
  47. +++ b/grub-core/lib/gnulib-patches/fix-null-state-deref.patch
  48. @@ -0,0 +1,12 @@
  49. +--- a/lib/argp-help.c 2020-10-28 14:32:19.189215988 +0000
  50. ++++ b/lib/argp-help.c 2020-10-28 14:38:21.204673940 +0000
  51. +@@ -145,7 +145,8 @@
  52. + if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin)
  53. + {
  54. + __argp_failure (state, 0, 0,
  55. +- dgettext (state->root_argp->argp_domain,
  56. ++ dgettext (state == NULL ? NULL
  57. ++ : state->root_argp->argp_domain,
  58. + "\
  59. + ARGP_HELP_FMT: %s value is less than or equal to %s"),
  60. + "rmargin", up->name);
  61. diff --git a/grub-core/lib/gnulib/argp-help.c b/grub-core/lib/gnulib/argp-help.c
  62. index 5d8f451..c75568c 100644
  63. --- a/grub-core/lib/gnulib/argp-help.c
  64. +++ b/grub-core/lib/gnulib/argp-help.c
  65. @@ -145,7 +145,8 @@ validate_uparams (const struct argp_state *state, struct uparams *upptr)
  66. if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin)
  67. {
  68. __argp_failure (state, 0, 0,
  69. - dgettext (state->root_argp->argp_domain,
  70. + dgettext (state == NULL ? NULL
  71. + : state->root_argp->argp_domain,
  72. "\
  73. ARGP_HELP_FMT: %s value is less than or equal to %s"),
  74. "rmargin", up->name);
  75. --
  76. 2.14.2