1 files changed, 72 insertions, 71 deletions

diff --git a/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_4.patch b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_4.patch
index 5fa72b4f9b..a3c5af2f1c 100644
--- a/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_4.patch
+++ b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_4.patch
@@ -33,105 +33,106 @@ Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
  1 file changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/dmidecode.c b/dmidecode.c
-index b4dbc9d..870d94e 100644
+index 1ecdf85..640c079 100644
 --- a/dmidecode.c
 +++ b/dmidecode.c
 @@ -5736,14 +5736,14 @@ static void overwrite_smbios3_address(u8 *buf)
-        buf[0x17] = 0;
+        buf[0x17] = 0;
  }
-
+ 
 -static int smbios3_decode(u8 *buf, const char *devmem, u32 flags)
 +static int smbios3_decode(u8 *buf, size_t buf_len, const char *devmem, u32 flags)
  {
-        u32 ver, len;
-        u64 offset;
-        u8 *table;
-
-        /* Don't let checksum run beyond the buffer */
+        u32 ver, len;
+        u64 offset;
+        u8 *table;
+ 
+        /* Don't let checksum run beyond the buffer */
 -       if (buf[0x06] > 0x20)
 +        if (buf[0x06] > buf_len)
-        {
-                fprintf(stderr,
-                        "Entry point length too large (%u bytes, expected %u).\n",
-@@ -5782,14 +5782,14 @@ static int smbios3_decode(u8 *buf, const char *devmem, u32 flags)
-        return 1;
+        {
+                fprintf(stderr,
+                        "Entry point length too large (%u bytes, expected %u).\n",
+@@ -5793,14 +5793,14 @@ static int smbios3_decode(u8 *buf, const char *devmem, u32 flags)
+        return 1;
  }
-
+ 
 -static int smbios_decode(u8 *buf, const char *devmem, u32 flags)
 +static int smbios_decode(u8 *buf, size_t buf_len, const char *devmem, u32 flags)
  {
-        u16 ver;
-        u32 len;
-         u8 *table;
-
-        /* Don't let checksum run beyond the buffer */
+        u16 ver, num;
+        u32 len;
+        u8 *table;
+ 
+        /* Don't let checksum run beyond the buffer */
 -       if (buf[0x05] > 0x20)
 +        if (buf[0x05] > buf_len)
-        {
-                fprintf(stderr,
-                        "Entry point length too large (%u bytes, expected %u).\n",
-@@ -6018,12 +6018,12 @@ int main(int argc, char * const argv[])
-
-                if (memcmp(buf, "_SM3_", 5) == 0)
-                {
+        {
+                fprintf(stderr,
+                        "Entry point length too large (%u bytes, expected %u).\n",
+@@ -6052,12 +6052,12 @@ int main(int argc, char * const argv[])
+ 
+                if (memcmp(buf, "_SM3_", 5) == 0)
+                {
 -                       if (smbios3_decode(buf, opt.dumpfile, 0))
 +                        if (smbios3_decode(buf, size, opt.dumpfile, 0))
-                                found++;
-                }
-                else if (memcmp(buf, "_SM_", 4) == 0)
-                {
+                                found++;
+                }
+                else if (memcmp(buf, "_SM_", 4) == 0)
+                {
 -                       if (smbios_decode(buf, opt.dumpfile, 0))
 +                        if (smbios_decode(buf, size, opt.dumpfile, 0))
-                                found++;
-                }
-                else if (memcmp(buf, "_DMI_", 5) == 0)
-@@ -6046,12 +6046,12 @@ int main(int argc, char * const argv[])
-                        pr_info("Getting SMBIOS data from sysfs.");
-                if (size >= 24 && memcmp(buf, "_SM3_", 5) == 0)
-                {
+                                found++;
+                }
+                else if (memcmp(buf, "_DMI_", 5) == 0)
+@@ -6080,12 +6080,12 @@ int main(int argc, char * const argv[])
+                        pr_info("Getting SMBIOS data from sysfs.");
+                if (size >= 24 && memcmp(buf, "_SM3_", 5) == 0)
+                {
 -                       if (smbios3_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET))
 +                        if (smbios3_decode(buf, size, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET))
-                                found++;
-                }
-                else if (size >= 31 && memcmp(buf, "_SM_", 4) == 0)
-                {
+                                found++;
+                }
+                else if (size >= 31 && memcmp(buf, "_SM_", 4) == 0)
+                {
 -                       if (smbios_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET))
 +                        if (smbios_decode(buf, size, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET))
-                                found++;
-                }
-                else if (size >= 15 && memcmp(buf, "_DMI_", 5) == 0)
-@@ -6088,12 +6088,12 @@ int main(int argc, char * const argv[])
-
-        if (memcmp(buf, "_SM3_", 5) == 0)
-        {
+                                found++;
+                }
+                else if (size >= 15 && memcmp(buf, "_DMI_", 5) == 0)
+@@ -6122,12 +6122,12 @@ int main(int argc, char * const argv[])
+ 
+        if (memcmp(buf, "_SM3_", 5) == 0)
+        {
 -               if (smbios3_decode(buf, opt.devmem, 0))
 +                if (smbios3_decode(buf, 0x20, opt.devmem, 0))
-                        found++;
-        }
-        else if (memcmp(buf, "_SM_", 4) == 0)
-        {
+                        found++;
+        }
+        else if (memcmp(buf, "_SM_", 4) == 0)
+        {
 -               if (smbios_decode(buf, opt.devmem, 0))
 +                if (smbios_decode(buf, 0x20, opt.devmem, 0))
-                        found++;
-        }
-        goto done;
-@@ -6114,7 +6114,7 @@ memory_scan:
-        {
-                if (memcmp(buf + fp, "_SM3_", 5) == 0)
-                {
+                        found++;
+        }
+        goto done;
+@@ -6148,7 +6148,7 @@ int main(int argc, char * const argv[])
+        {
+                if (memcmp(buf + fp, "_SM3_", 5) == 0)
+                {
 -                       if (smbios3_decode(buf + fp, opt.devmem, 0))
 +                        if (smbios3_decode(buf + fp, 0x20, opt.devmem, 0))
-                        {
-                                found++;
-                                goto done;
-@@ -6127,7 +6127,7 @@ memory_scan:
-        {
-                if (memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0)
-                {
+                        {
+                                found++;
+                                goto done;
+@@ -6161,7 +6161,7 @@ int main(int argc, char * const argv[])
+        {
+                if (memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0)
+                {
 -                       if (smbios_decode(buf + fp, opt.devmem, 0))
 +                        if (smbios_decode(buf + fp, 0x20, opt.devmem, 0))
-                        {
-                                found++;
-                                goto done;
---
-2.35.5
+                        {
+                                found++;
+                                goto done;
+-- 
+2.42.0
+