diff options
| -rw-r--r-- | string/test-strstr.c | 41 | ||||
| -rw-r--r-- | sysdeps/s390/strstr-arch13.S | 2 |
2 files changed, 36 insertions, 7 deletions
diff --git a/string/test-strstr.c b/string/test-strstr.c index 37fcb68cdf..049f0e10e8 100644 --- a/string/test-strstr.c +++ b/string/test-strstr.c @@ -139,16 +139,45 @@ check1 (void) static void check2 (void) { - const char s1[] = ", enable_static, \0, enable_shared, "; + const char s1_stack[] = ", enable_static, \0, enable_shared, "; + const size_t s1_byte_count = 18; + const char *s2_stack = &(s1_stack[s1_byte_count]); + const size_t s2_byte_count = 18; char *exp_result; - char *s2 = (void *) buf1 + page_size - 18; + const size_t page_size_real = getpagesize (); - strcpy (s2, s1); - exp_result = stupid_strstr (s1, s1 + 18); + /* Haystack at end of page. The following page is protected. */ + char *s1_page_end = (void *) buf1 + page_size - s1_byte_count; + strcpy (s1_page_end, s1_stack); + + /* Haystack which crosses a page boundary. + Note: page_size is at least 2 * getpagesize. See test_init. */ + char *s1_page_cross = (void *) buf1 + page_size_real - 8; + strcpy (s1_page_cross, s1_stack); + + /* Needle at end of page. The following page is protected. */ + char *s2_page_end = (void *) buf2 + page_size - s2_byte_count; + strcpy (s2_page_end, s2_stack); + + /* Needle which crosses a page boundary. + Note: page_size is at least 2 * getpagesize. See test_init. */ + char *s2_page_cross = (void *) buf2 + page_size_real - 8; + strcpy (s2_page_cross, s2_stack); + + exp_result = stupid_strstr (s1_stack, s2_stack); FOR_EACH_IMPL (impl, 0) { - check_result (impl, s1, s1 + 18, exp_result); - check_result (impl, s2, s1 + 18, exp_result); + check_result (impl, s1_stack, s2_stack, exp_result); + check_result (impl, s1_stack, s2_page_end, exp_result); + check_result (impl, s1_stack, s2_page_cross, exp_result); + + check_result (impl, s1_page_end, s2_stack, exp_result); + check_result (impl, s1_page_end, s2_page_end, exp_result); + check_result (impl, s1_page_end, s2_page_cross, exp_result); + + check_result (impl, s1_page_cross, s2_stack, exp_result); + check_result (impl, s1_page_cross, s2_page_end, exp_result); + check_result (impl, s1_page_cross, s2_page_cross, exp_result); } } diff --git a/sysdeps/s390/strstr-arch13.S b/sysdeps/s390/strstr-arch13.S index 92cafd3850..aefdb499e4 100644 --- a/sysdeps/s390/strstr-arch13.S +++ b/sysdeps/s390/strstr-arch13.S @@ -164,7 +164,7 @@ ENTRY(STRSTR_ARCH13) vfenezb %v19,%v18,%v18 /* Search zero in loaded needle bytes. */ veclb %v19,%v21 /* Zero index <= max loaded byte index? */ jle .Lneedle_loaded /* -> v18 contains full needle. */ - vl %v16,0(%r3) /* Load needle beyond page boundary. */ + vl %v18,0(%r3) /* Load needle beyond page boundary. */ vfenezb %v19,%v18,%v18 j .Lneedle_loaded END(STRSTR_ARCH13) |