Fix an issue in an f2fs security fix which caused mount failures

Closes: #1021846. Thanks to программист некто for helping to debug the
problem!

diff --git a/debian/changelog b/debian/changelog
index bb30cd925fae9d80efa0f9df5df21a02423558f6..e1116b7dc8eb207b15b9351d33d08da6f9d9a5b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+grub2 (2.06-8) UNRELEASED; urgency=medium
+
+  [ Steve McIntyre ]
+
+  * Fix an issue in an f2fs security fix which caused mount
+    failures. Closes: #1021846. Thanks to программист некто for helping
+    to debug the problem!
+
+ -- Steve McIntyre <93sam@debian.org>  Sun, 11 Dec 2022 12:08:44 +0000
+
 grub2 (2.06-7) unstable; urgency=medium
 
   [ Steve McIntyre ]

diff --git a/debian/patches/0087-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch b/debian/patches/0087-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch
index 6561abd8886dbe157ce80b711abdda4e3be5089b..cc6520ede1b73fe6e6a109e7049435553aaf764c 100644 (file)
--- a/debian/patches/0087-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch
+++ b/debian/patches/0087-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch
@@ -34,7 +34,7 @@ index 8a9992ca9..63702214b 100644
 -  grub_uint32_t blkaddr = 0;
    grub_uint16_t i;
  
-+  if (n >= NAT_JOURNAL_ENTRIES)
++  if (n > NAT_JOURNAL_ENTRIES)
 +    return grub_error (GRUB_ERR_BAD_FS,
 +                       "invalid number of nat journal entries");
 +