Commit 8e0ab8e2 authored by Roberto Sassu's avatar Roberto Sassu Committed by Vasily Gorbik
Browse files

s390: fix strrchr() implementation 



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: 1da177e4 ("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: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Link: https://lore.kernel.org/r/20211005120836.60630-1-roberto.sassu@huawei.com


Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 45409389

arch/s390/lib/string.c

+7 −8
Original line number Diff line number Diff line
@@ -259,13 +259,12 @@ EXPORT_SYMBOL(strcmp); 
#ifdef __HAVE_ARCH_STRRCHR

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);

	} while (--len >= 0);

	return NULL;

}

EXPORT_SYMBOL(strrchr);