Commit 7745382f authored Oct 09, 2017 by Michael Ellerman Committed by Greg Kroah-Hartman Dec 20, 2017

powerpc/perf/hv-24x7: Fix incorrect comparison in memord




[ Upstream commit 05c14c03138532a3cb2aa29c2960445c8753343b ]

In the hv-24x7 code there is a function memord() which tries to
implement a sort function return -1, 0, 1. However one of the
conditions is incorrect, such that it can never be true, because we
will have already returned.

I don't believe there is a bug in practice though, because the
comparisons are an optimisation prior to calling memcmp().

Fix it by swapping the second comparision, so it can be true.

Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ab9d2571

arch/powerpc/perf/hv-24x7.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -516,7 +516,7 @@ static int memord(const void d1, size_t s1, const void d2, size_t s2)
		{
		if (s1 < s2)
		return 1;
		if (s2 > s1)
		if (s1 > s2)
		return -1;

		return memcmp(d1, d2, s1);