0058-gnulib-regexec-Fix-possible-null-dereference.patch 3.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283
  1. From 0b7f347638153e403ee2dd518af3ce26f4f99647 Mon Sep 17 00:00:00 2001
  2. From: Darren Kenny <darren.kenny@oracle.com>
  3. Date: Thu, 5 Nov 2020 10:57:14 +0000
  4. Subject: [PATCH] gnulib/regexec: Fix possible null-dereference
  5. It appears to be possible that the mctx->state_log field may be NULL,
  6. and the name of this function, clean_state_log_if_needed(), suggests
  7. that it should be checking that it is valid to be cleaned before
  8. assuming that it does.
  9. Fixes: CID 86720
  10. Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
  11. Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
  12. [Add changes to generated files]
  13. Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
  14. ---
  15. Makefile.in | 1 +
  16. conf/Makefile.extra-dist | 1 +
  17. grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch | 12 ++++++++++++
  18. grub-core/lib/gnulib/regexec.c | 3 +++
  19. 4 files changed, 17 insertions(+)
  20. create mode 100644 grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch
  21. diff --git a/Makefile.in b/Makefile.in
  22. index 812b7c2..d9da6e9 100644
  23. --- a/Makefile.in
  24. +++ b/Makefile.in
  25. @@ -2743,6 +2743,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \
  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-regexec-null-deref.patch \
  30. grub-core/lib/gnulib-patches/fix-uninit-structure.patch \
  31. grub-core/lib/gnulib-patches/fix-unused-value.patch \
  32. grub-core/lib/gnulib-patches/fix-width.patch \
  33. diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
  34. index 96d7e69..d27d3a9 100644
  35. --- a/conf/Makefile.extra-dist
  36. +++ b/conf/Makefile.extra-dist
  37. @@ -30,6 +30,7 @@ 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-regexec-null-deref.patch
  41. EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch
  42. EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch
  43. EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch
  44. diff --git a/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch b/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch
  45. new file mode 100644
  46. index 0000000..db6dac9
  47. --- /dev/null
  48. +++ b/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch
  49. @@ -0,0 +1,12 @@
  50. +--- a/lib/regexec.c 2020-10-21 14:25:35.310195912 +0000
  51. ++++ b/lib/regexec.c 2020-11-05 10:55:09.621542984 +0000
  52. +@@ -1692,6 +1692,9 @@
  53. + {
  54. + Idx top = mctx->state_log_top;
  55. +
  56. ++ if (mctx->state_log == NULL)
  57. ++ return REG_NOERROR;
  58. ++
  59. + if ((next_state_log_idx >= mctx->input.bufs_len
  60. + && mctx->input.bufs_len < mctx->input.len)
  61. + || (next_state_log_idx >= mctx->input.valid_len
  62. diff --git a/grub-core/lib/gnulib/regexec.c b/grub-core/lib/gnulib/regexec.c
  63. index 98a25f5..df97667 100644
  64. --- a/grub-core/lib/gnulib/regexec.c
  65. +++ b/grub-core/lib/gnulib/regexec.c
  66. @@ -1696,6 +1696,9 @@ clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx)
  67. {
  68. Idx top = mctx->state_log_top;
  69. + if (mctx->state_log == NULL)
  70. + return REG_NOERROR;
  71. +
  72. if ((next_state_log_idx >= mctx->input.bufs_len
  73. && mctx->input.bufs_len < mctx->input.len)
  74. || (next_state_log_idx >= mctx->input.valid_len
  75. --
  76. 2.14.2