1 files changed, 28 insertions, 27 deletions

diff --git a/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_3.patch b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_3.patch
index 01d0d1f867..5a6994065e 100644
--- a/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_3.patch
+++ b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_3.patch
@@ -27,26 +27,26 @@ Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/dmidecode.c b/dmidecode.c
-index 98f9692..b4dbc9d 100644
+index d339577..1ecdf85 100644
 --- a/dmidecode.c
 +++ b/dmidecode.c
-@@ -5997,17 +5997,25 @@ int main(int argc, char * const argv[])
-                pr_comment("dmidecode %s", VERSION);
-
-        /* Read from dump if so instructed */
+@@ -6031,17 +6031,25 @@ int main(int argc, char * const argv[])
+                pr_comment("dmidecode %s", VERSION);
+ 
+        /* Read from dump if so instructed */
 +        size = 0x20;
-        if (opt.flags & FLAG_FROM_DUMP)
-        {
-                if (!(opt.flags & FLAG_QUIET))
-                        pr_info("Reading SMBIOS/DMI data from file %s.",
-                                opt.dumpfile);
+        if (opt.flags & FLAG_FROM_DUMP)
+        {
+                if (!(opt.flags & FLAG_QUIET))
+                        pr_info("Reading SMBIOS/DMI data from file %s.",
+                                opt.dumpfile);
 -               if ((buf = mem_chunk(0, 0x20, opt.dumpfile)) == NULL)
 +                if ((buf = read_file(0, &size, opt.dumpfile)) == NULL)
-                {
-                        ret = 1;
-                        goto exit_free;
-                }
-
+                {
+                        ret = 1;
+                        goto exit_free;
+                }
+ 
 +                /* Truncated entry point can't be processed */
 +                if (size < 0x20)
 +                {
@@ -54,16 +54,17 @@ index 98f9692..b4dbc9d 100644
 +                        goto done;
 +                }
 +
-                if (memcmp(buf, "_SM3_", 5) == 0)
-                {
-                        if (smbios3_decode(buf, opt.dumpfile, 0))
-@@ -6031,7 +6039,6 @@ int main(int argc, char * const argv[])
-         * contain one of several types of entry points, so read enough for
-         * the largest one, then determine what type it contains.
-         */
+                if (memcmp(buf, "_SM3_", 5) == 0)
+                {
+                        if (smbios3_decode(buf, opt.dumpfile, 0))
+@@ -6065,7 +6073,6 @@ int main(int argc, char * const argv[])
+         * contain one of several types of entry points, so read enough for
+         * the largest one, then determine what type it contains.
+         */
 -       size = 0x20;
-        if (!(opt.flags & FLAG_NO_SYSFS)
-         && (buf = read_file(0, &size, SYS_ENTRY_FILE)) != NULL)
-        {
---
-2.40.0
+        if (!(opt.flags & FLAG_NO_SYSFS)
+         && (buf = read_file(0, &size, SYS_ENTRY_FILE)) != NULL)
+        {
+-- 
+2.42.0
+