From 35a7c3e536449b20eca9a9e533d70bb9541c7443 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Wed, 1 Jul 2015 08:31:13 -0700 Subject: [PATCH] libselinux: Fix file labels for regexes with metachars File labels assigned using the lookup_best_match() function do not assign the best match if its regex contains metacharacters. For non-exact regex matches, lookup_best_match() finds the closest match by tracking the length of the matching prefix. Prefix match is tracked via the prefix_len variable. This was previously calculated and set in the spec_hasMetaChars() function. Commit 3cb6078 removed the prefix_len calculation, this commit restores it. Signed-off-by: Jeff Vander Stoep --- libselinux/src/label_file.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libselinux/src/label_file.h b/libselinux/src/label_file.h index 73bcbbac..30bc9112 100644 --- a/libselinux/src/label_file.h +++ b/libselinux/src/label_file.h @@ -148,6 +148,7 @@ static inline void spec_hasMetaChars(struct spec *spec) end = c + len; spec->hasMetaChars = 0; + spec->prefix_len = len; /* Look at each character in the RE specification string for a * meta character. Return when any meta character reached. */ @@ -164,6 +165,7 @@ static inline void spec_hasMetaChars(struct spec *spec) case '(': case '{': spec->hasMetaChars = 1; + spec->prefix_len = c - spec->regex_str; return; case '\\': /* skip the next character */ c++;