Open
pam_unix: declare read-only data array const #150
jia-wenhao1017Add on Apr 21, 2025
pam_unix: declare read-only data array const #150
Open
Merged fromrefs/pull/150/headintoopenEuler-24.03-LTS-SP1
Total: 2 files changed+30-1
| @@ -0,0 +1,25 @@ | |||
| 1 | +From 4aab3a8817219050ed2701523ca4fc49d9905d59 Mon Sep 17 00:00:00 2001 | ||
| 2 | +From: jiawenhao <jiawenhao@xfusion.com> | ||
| 3 | +Date: Mon, 21 Apr 2025 16:23:08 +0800 | ||
| 4 | +Subject: [PATCH] declare-read-only-data-array-const | ||
H | |||
| 5 | + | ||
| 6 | +--- | ||
| 7 | + modules/pam_unix/md5_crypt.c | 2 +- | ||
| 8 | + 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 9 | + | ||
| 10 | +diff --git a/modules/pam_unix/md5_crypt.c b/modules/pam_unix/md5_crypt.c | ||
| 11 | +index ed5ecda..ab0a14d 100644 | ||
| 12 | +--- a/modules/pam_unix/md5_crypt.c | ||
| 13 | ++++ b/modules/pam_unix/md5_crypt.c | ||
| 14 | +@@ -17,7 +17,7 @@ | ||
| 15 | + #include "md5.h" | ||
| 16 | + #include "pam_inline.h" | ||
| 17 | + | ||
| 18 | +-static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ | ||
| 19 | ++static const unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ | ||
| 20 | + "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; | ||
| 21 | + | ||
| 22 | + static void to64(char *s, unsigned long v, int n) | ||
| 23 | +-- | ||
| 24 | +2.27.0 | ||
| 25 | + | ||
| @@ -4,7 +4,7 @@ | |||
| 4 | %define _pamconfdir %{_sysconfdir}/pam.d | 4 | %define _pamconfdir %{_sysconfdir}/pam.d |
| 5 | Name: pam | 5 | Name: pam |
| 6 | Version: 1.5.3 | 6 | Version: 1.5.3 |
| 7 | -Release: 8 | 7 | +Release: 9 |
| 8 | Summary: Pluggable Authentication Modules for Linux | 8 | Summary: Pluggable Authentication Modules for Linux |
| 9 | License: BSD and GPLv2+ | 9 | License: BSD and GPLv2+ |
| 10 | URL: http://www.linux-pam.org/ | 10 | URL: http://www.linux-pam.org/ |
| @@ -28,6 +28,7 @@ Patch5: backport-CVE-2024-10963.patch | |||
| 28 | Patch6: backport-CVE-2024-10041.patch | 28 | Patch6: backport-CVE-2024-10041.patch |
| 29 | Patch7: backport-CVE-2024-10041-pam_unix-try-to-set-uid-to-0-for-unix_chkpwd.patch | 29 | Patch7: backport-CVE-2024-10041-pam_unix-try-to-set-uid-to-0-for-unix_chkpwd.patch |
| 30 | Patch8: backport-libpam-use-close_range-to-close-file-descriptors.patch | 30 | Patch8: backport-libpam-use-close_range-to-close-file-descriptors.patch |
| 31 | +Patch9: backport-declare-read-only-data-array-const.patch | ||
| 31 | 32 | ||
| 32 | Patch9000:change-ndbm-to-gdbm.patch | 33 | Patch9000:change-ndbm-to-gdbm.patch |
| 33 | Patch9001:add-sm3-crypt-support.patch | 34 | Patch9001:add-sm3-crypt-support.patch |
| @@ -182,6 +183,9 @@ make check | |||
| 182 | 183 | ||
| 183 | 184 | ||
| 184 | %changelog | 185 | %changelog |
| 186 | +* Mon Apr 21 2025 jiawenhao <jiawenhao@xfusion.com> - 1.5.3-9 | ||
| 187 | +- declare read-only data array const | ||
| 188 | + | ||
| 185 | * Mon Mar 24 2025 hugel <gengqihu2@h-partners.com> - 1.5.3-8 | 189 | * Mon Mar 24 2025 hugel <gengqihu2@h-partners.com> - 1.5.3-8 |
| 186 | - backport patch libpam use close_range() to close file descriptors | 190 | - backport patch libpam use close_range() to close file descriptors |
| 187 | 191 | ||
请使用上游社区补丁头