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

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. From a12325a0cbf3bf1d66a0b0f8d85e08083bae6066 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?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=UTF-8
  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. Upstream-Status: Submitted [https://gitlab.com/ynezz/openwrt-libubox/commit/3775b3aa28de8c20d96b6f02786a327423b0748a]
  17. Reported-by: Khem Raj <raj.khem@gmail.com>
  18. Signed-off-by: Petr Štetiar <ynezz@true.cz>
  19. ---
  20. blobmsg.c | 2 +-
  21. 1 file changed, 1 insertion(+), 1 deletion(-)
  22. diff --git a/blobmsg.c b/blobmsg.c
  23. index a860483..b6b7535 100644
  24. --- a/blobmsg.c
  25. +++ b/blobmsg.c
  26. @@ -195,7 +195,7 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v
  27. attr->id_len |= be32_to_cpu(BLOB_ATTR_EXTENDED);
  28. hdr = blob_data(attr);
  29. hdr->namelen = cpu_to_be16(namelen);
  30. - strcpy((char *) hdr->name, (const char *)name);
  31. + memcpy(hdr->name, name, namelen);
  32. pad_end = *data = blobmsg_data(attr);
  33. pad_start = (char *) &hdr->name[namelen];
  34. if (pad_start < pad_end)
  35. --
  36. 2.24.1