diff --git a/0040-enhance-pointer-safe.patch b/0040-enhance-pointer-safe.patch new file mode 100644 index 0000000000000000000000000000000000000000..4580c43885428110d7d4f21ea9cd831c269a3af0 --- /dev/null +++ b/0040-enhance-pointer-safe.patch @@ -0,0 +1,33 @@ +From 9cf127b4297b8d0e4f3fd34c264d7b1648bad77f Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac +Date: Fri, 3 May 2024 12:38:39 +0200 +Subject: [PATCH] const: suffixes + +--- + tools/lvmcmdline.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c +index 66b269538..38e3ce190 100644 +--- a/tools/lvmcmdline.c ++++ b/tools/lvmcmdline.c +@@ -566,7 +566,7 @@ static int _size_arg(struct cmd_context *cmd __attribute__((unused)), + { + char *ptr; + int i; +- static const char *suffixes = "kmgtpebs"; ++ static const char _suffixes[] = "kmgtpebs"; + char *val; + double v; + uint64_t v_tmp, adjustment; +@@ -626,8 +626,8 @@ static int _size_arg(struct cmd_context *cmd __attribute__((unused)), + return 0; + } + } else if (*ptr) { +- for (i = strlen(suffixes) - 1; i >= 0; i--) +- if (suffixes[i] == tolower((int) *ptr)) ++ for (i = sizeof(_suffixes) - 1; i >= 0; --i) ++ if (_suffixes[i] == tolower((int) *ptr)) + break; + + if (i < 0) { diff --git a/lvm2.spec b/lvm2.spec index 2aa1314b400d866f0771b8dbb204ac4674d88f78..bf7c4afe0dfbba5d8acc3fc70b709459f6afb758 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -43,7 +43,7 @@ Name: lvm2 Version: 2.03.14 -Release: 21 +Release: 22 Epoch: 8 Summary: Tools for logical volume management License: GPLv2+ and LGPLv2.1 and BSD @@ -88,6 +88,7 @@ Patch36: 0036-config-check-for-0-from-read.patch Patch37: 0037-fix-pv_major-and-pv_minor-report-field-type.patch Patch38: 0038-fix-buffer-size-usage.patch Patch39: 0039-add-internal-error-for-missing-vg.patch +Patch40: 0040-enhance-pointer-safe.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -514,6 +515,9 @@ fi %changelog +* Thu Nov 13 2025 weishuaihao - 8:2.03.14-22 +- enhance pointer safe + * Tue Nov 11 2025 weishuaihao - 8:2.03.14-21 - Add internal error for missing vg