lkml.org 
[lkml]   [2021]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 02/44] s390: fix strrchr() implementation
    Date
    From: Roberto Sassu <roberto.sassu@huawei.com>

    commit 8e0ab8e26b72a80e991c66a8abc16e6c856abe3d upstream.

    Fix two problems found in the strrchr() implementation for s390
    architectures: evaluate empty strings (return the string address instead of
    NULL, if '\0' is passed as second argument); evaluate the first character
    of non-empty strings (the current implementation stops at the second).

    Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
    Cc: stable@vger.kernel.org
    Reported-by: Heiko Carstens <hca@linux.ibm.com> (incorrect behavior with empty strings)
    Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
    Link: https://lore.kernel.org/r/20211005120836.60630-1-roberto.sassu@huawei.com
    Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
    Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/s390/lib/string.c | 13 ++++++-------
    1 file changed, 6 insertions(+), 7 deletions(-)

    --- a/arch/s390/lib/string.c
    +++ b/arch/s390/lib/string.c
    @@ -225,14 +225,13 @@ EXPORT_SYMBOL(strcmp);
    */
    char * strrchr(const char * s, int c)
    {
    - size_t len = __strend(s) - s;
    + ssize_t len = __strend(s) - s;

    - if (len)
    - do {
    - if (s[len] == (char) c)
    - return (char *) s + len;
    - } while (--len > 0);
    - return NULL;
    + do {
    + if (s[len] == (char)c)
    + return (char *)s + len;
    + } while (--len >= 0);
    + return NULL;
    }
    EXPORT_SYMBOL(strrchr);


    \
     
     \ /
      Last update: 2021-10-25 21:15    [W:4.089 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site