diff --git a/autofs-5.1.9-Fix-masks-in-parse_sub.c-so-that-hosts-are-correctly-matched.patch b/autofs-5.1.9-Fix-masks-in-parse_sub.c-so-that-hosts-are-correctly-matched.patch new file mode 100644 index 0000000..2411fe7 --- /dev/null +++ b/autofs-5.1.9-Fix-masks-in-parse_sub.c-so-that-hosts-are-correctly-matched.patch @@ -0,0 +1,44 @@ +autofs-5.1.9 - Fix masks in parse_sub.c, so that hosts are correctly matched. + +From: Thiago Becker + +In the case local address is 10.x.x.x and one of the replica addresses +is 138.x.x.x, MASK_A will make both equal, and get_priority will return +PROXIMITY_NET, which is not correct. + +MASK_A = 0x7F000000 = 01111111 00000000 00000000 00000000 +LOCAL = 10.x.x.x = 00001010 00000000 00000000 00000000 +REMOTE = 138.x.x.x = 10001010 00000000 00000000 00000000 + +Signed-off-by: Thiago Becker +Signed-off-by: Ian Kent +--- + CHANGELOG | 1 + + lib/parse_subs.c | 6 +++--- + 2 files changed, 4 insertions(+), 3 deletions(-) + +--- autofs-5.1.7.orig/CHANGELOG ++++ autofs-5.1.7/CHANGELOG +@@ -199,6 +199,7 @@ + - improve handling of missing map entry for mount request. + - fix incorrect flags update in update_with_defaults(). + - skip expire check for amd nounmount mounts. ++- Fix masks in parse_sub.c, so that hosts are correctly matched. + + 25/01/2021 autofs-5.1.7 + - make bind mounts propagation slave by default. +--- autofs-5.1.7.orig/lib/parse_subs.c ++++ autofs-5.1.7/lib/parse_subs.c +@@ -37,9 +37,9 @@ + static int volatile ifc_buf_len = MAX_IFC_BUF; + static int volatile ifc_last_len = 0; + +-#define MASK_A 0x7F000000 +-#define MASK_B 0xBFFF0000 +-#define MASK_C 0xDFFFFF00 ++#define MASK_A 0xFF000000 ++#define MASK_B 0xFFFF0000 ++#define MASK_C 0xFFFFFF00 + + /* Get numeric value of the n bits starting at position p */ + #define getbits(x, p, n) ((x >> (p + 1 - n)) & ~(~0 << n)) diff --git a/autofs.spec b/autofs.spec index ee21071..bf05abe 100644 --- a/autofs.spec +++ b/autofs.spec @@ -12,7 +12,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.1.7 -Release: 67%{?dist} +Release: 68%{?dist} Epoch: 1 License: GPLv2+ Source: https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-2.tar.gz @@ -250,6 +250,9 @@ Patch224: autofs-5.1.9-improve-handling-of-missing-map-entry-for-mount-request.p Patch225: autofs-5.1.9-fix-incorrect-flags-update-in-update_with_defaults.patch Patch226: autofs-5.1.9-skip-expire-check-for-amd-nounmount-mounts.patch +# JIRA: RHEL-157745 +Patch227: autofs-5.1.9-Fix-masks-in-parse_sub.c-so-that-hosts-are-correctly-matched.patch + %if %{with_systemd} BuildRequires: systemd-units BuildRequires: systemd-devel @@ -528,6 +531,8 @@ echo %{version}-%{release} > .version %patch -P 225 -p1 %patch -P 226 -p1 +%patch -P 227 -p1 + %build LDFLAGS=-Wl,-z,now %configure \ @@ -635,6 +640,11 @@ fi %dir /etc/auto.master.d %changelog +* Fri Mar 20 2026 Ian Kent - 1:5.1.7-68 +- RHEL-157745 - get_proximity returns a worng proximity on specific addresses + - Fix masks in parse_sub.c, so that hosts are correctly matched. +- Resolves: RHEL-157745 + * Wed Mar 09 2026 Ian Kent - 1:5.1.7-67 - RHEL-150237 - RFE: autofs: add handling for AMD 'nounmount' option [rhel-9] - fix incorrect flags update in update_with_defaults().