6eaa34fe07
- Resolves: CVE-2024-45779 CVE-2024-45778 CVE-2025-1118 - Resolves: CVE-2025-0677 CVE-2024-45782 CVE-2025-0690 - Resolves: CVE-2024-45783 CVE-2025-0624 CVE-2024-45776 - Resolves: CVE-2025-0622 CVE-2024-45774 CVE-2024-45775 - Resolves: CVE-2024-45781 CVE-2024-45780 - Resolves: #RHEL-79700 - Resolves: #RHEL-79341 - Resolves: #RHEL-79875 - Resolves: #RHEL-79849 - Resolves: #RHEL-79707 - Resolves: #RHEL-79857 - Resolves: #RHEL-79709 - Resolves: #RHEL-79846 - Resolves: #RHEL-75737 - Resolves: #RHEL-79713 - Resolves: #RHEL-73785 - Resolves: #RHEL-73787 - Resolves: #RHEL-79704 - Resolves: #RHEL-79702 Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: B Horn <b@horn.uk>
|
|
Date: Sat, 15 Jun 2024 02:33:08 +0100
|
|
Subject: [PATCH] misc: Implement grub_strlcpy()
|
|
|
|
grub_strlcpy() acts the same way as strlcpy() does on most *NIX,
|
|
returning the length of src and ensuring dest is always NUL
|
|
terminated except when size is 0.
|
|
|
|
Signed-off-by: B Horn <b@horn.uk>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
include/grub/misc.h | 39 +++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 39 insertions(+)
|
|
|
|
diff --git a/include/grub/misc.h b/include/grub/misc.h
|
|
index 981526644..0592aa68f 100644
|
|
--- a/include/grub/misc.h
|
|
+++ b/include/grub/misc.h
|
|
@@ -72,6 +72,45 @@ grub_stpcpy (char *dest, const char *src)
|
|
return d - 1;
|
|
}
|
|
|
|
+static inline grub_size_t
|
|
+grub_strlcpy (char *dest, const char *src, grub_size_t size)
|
|
+{
|
|
+ char *d = dest;
|
|
+ grub_size_t res = 0;
|
|
+ /*
|
|
+ * We do not subtract one from size here to avoid dealing with underflowing
|
|
+ * the value, which is why to_copy is always checked to be greater than one
|
|
+ * throughout this function.
|
|
+ */
|
|
+ grub_size_t to_copy = size;
|
|
+
|
|
+ /* Copy size - 1 bytes to dest. */
|
|
+ if (to_copy > 1)
|
|
+ while ((*d++ = *src++) != '\0' && ++res && --to_copy > 1)
|
|
+ ;
|
|
+
|
|
+ /*
|
|
+ * NUL terminate if size != 0. The previous step may have copied a NUL byte
|
|
+ * if it reached the end of the string, but we know dest[size - 1] must always
|
|
+ * be a NUL byte.
|
|
+ */
|
|
+ if (size != 0)
|
|
+ dest[size - 1] = '\0';
|
|
+
|
|
+ /* If there is still space in dest, but are here, we reached the end of src. */
|
|
+ if (to_copy > 1)
|
|
+ return res;
|
|
+
|
|
+ /*
|
|
+ * If we haven't reached the end of the string, iterate through to determine
|
|
+ * the strings total length.
|
|
+ */
|
|
+ while (*src++ != '\0' && ++res)
|
|
+ ;
|
|
+
|
|
+ return res;
|
|
+}
|
|
+
|
|
/* XXX: If grub_memmove is too slow, we must implement grub_memcpy. */
|
|
static inline void *
|
|
grub_memcpy (void *dest, const void *src, grub_size_t n)
|