0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. From eb7eb6393d47a918c420f5b287946dbd6c0d5f57 Mon Sep 17 00:00:00 2001
  2. From: =?utf8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
  3. Date: Wed, 25 Dec 2019 10:27:59 +0100
  4. Subject: [PATCH] blobmsg: fix array out of bounds GCC 10 warning
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=utf8
  7. Content-Transfer-Encoding: 8bit
  8. Fixes following warning reported by GCC 10.0.0 20191203:
  9. blobmsg.c:234:2: error: 'strcpy' offset 6 from the object at 'attr' is out of the bounds of referenced subobject 'name' with type 'uint8_t[0]' {aka 'unsigned char[0]'} at offset 6 [-Werror=array-bounds]
  10. 234 | strcpy((char *) hdr->name, (const char *)name);
  11. | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  12. In file included from blobmsg.c:16:
  13. blobmsg.h:42:10: note: subobject 'name' declared here
  14. 42 | uint8_t name[];
  15. | ^~~~
  16. Reported-by: Khem Raj <raj.khem@gmail.com>
  17. Signed-off-by: Petr Å tetiar <ynezz@true.cz>
  18. [Retrieved from:
  19. https://git.openwrt.org/?p=project/libubox.git;a=commit;h=eb7eb6393d47a918c420f5b287946dbd6c0d5f57]
  20. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  21. ---
  22. blobmsg.c | 5 ++++-
  23. 1 file changed, 4 insertions(+), 1 deletion(-)
  24. diff --git a/blobmsg.c b/blobmsg.c
  25. index 48dba81..37821c3 100644
  26. --- a/blobmsg.c
  27. +++ b/blobmsg.c
  28. @@ -240,7 +240,10 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v
  29. attr->id_len |= be32_to_cpu(BLOB_ATTR_EXTENDED);
  30. hdr = blob_data(attr);
  31. hdr->namelen = cpu_to_be16(namelen);
  32. - strcpy((char *) hdr->name, (const char *)name);
  33. +
  34. + memcpy(hdr->name, name, namelen);
  35. + hdr->name[namelen] = '\0';
  36. +
  37. pad_end = *data = blobmsg_data(attr);
  38. pad_start = (char *) &hdr->name[namelen];
  39. if (pad_start < pad_end)
  40. --
  41. 2.20.1