X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-filter-interpreter.c;h=174f2b804f58fda409a477b657d884eb4d92c1d3;hb=07842fefbd73376d7a5ee568be3770bd46814f73;hp=bee291876afa7273310ab159824fd053dbbcf677;hpb=0039dbe9891cfdf2c0d04691f83c2f342993dfd7;p=lttng-modules.git

diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c
index bee29187..174f2b80 100644
--- a/lttng-filter-interpreter.c
+++ b/lttng-filter-interpreter.c
@@ -97,16 +97,14 @@ static
 int stack_star_glob_match(struct estack *stack, int top, const char *cmp_type)
 {
 	bool has_user = false;
-	mm_segment_t old_fs;
 	int result;
 	struct estack_entry *pattern_reg;
 	struct estack_entry *candidate_reg;
 
+	/* Disable the page fault handler when reading from userspace. */
 	if (estack_bx(stack, top)->u.s.user
 			|| estack_ax(stack, top)->u.s.user) {
 		has_user = true;
-		old_fs = get_fs();
-		set_fs(KERNEL_DS);
 		pagefault_disable();
 	}
 
@@ -122,10 +120,8 @@ int stack_star_glob_match(struct estack *stack, int top, const char *cmp_type)
 	/* Perform the match operation. */
 	result = !strutils_star_glob_match_char_cb(get_char_at_cb,
 		pattern_reg, get_char_at_cb, candidate_reg);
-	if (has_user) {
+	if (has_user)
 		pagefault_enable();
-		set_fs(old_fs);
-	}
 
 	return result;
 }
@@ -135,13 +131,10 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 {
 	size_t offset_bx = 0, offset_ax = 0;
 	int diff, has_user = 0;
-	mm_segment_t old_fs;
 
 	if (estack_bx(stack, top)->u.s.user
 			|| estack_ax(stack, top)->u.s.user) {
 		has_user = 1;
-		old_fs = get_fs();
-		set_fs(KERNEL_DS);
 		pagefault_disable();
 	}
 
@@ -226,10 +219,9 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 		offset_bx++;
 		offset_ax++;
 	}
-	if (has_user) {
+	if (has_user)
 		pagefault_enable();
-		set_fs(old_fs);
-	}
+
 	return diff;
 }