]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
powerpc/xmon: Fix another endiannes issue in RTAS call from xmon
authorLaurent Dufour <ldufour@linux.vnet.ibm.com>
Thu, 15 Jan 2015 17:23:47 +0000 (18:23 +0100)
committerLuis Henriques <luis.henriques@canonical.com>
Wed, 4 Feb 2015 10:58:05 +0000 (10:58 +0000)
commit e6eb2eba494d6f99e69ca3c3748cd37a2544ab38 upstream.

The commit 3b8a3c010969 ("powerpc/pseries: Fix endiannes issue in RTAS
call from xmon") was fixing an endianness issue in the call made from
xmon to RTAS.

However, as Michael Ellerman noticed, this fix was not complete, the
token value was not byte swapped. This lead to call an unexpected and
most of the time unexisting RTAS function, which is silently ignored by
RTAS.

This fix addresses this hole.

Reported-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Laurent Dufour <ldufour@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
arch/powerpc/xmon/xmon.c

index c6c497b40c45abdf58868a76722b5517c2267fc6..e660d201ddebaa73aae19b5ae8d7c98dd2af5240 100644 (file)
@@ -292,6 +292,7 @@ static inline void disable_surveillance(void)
        args.token = rtas_token("set-indicator");
        if (args.token == RTAS_UNKNOWN_SERVICE)
                return;
+       args.token = cpu_to_be32(args.token);
        args.nargs = cpu_to_be32(3);
        args.nret = cpu_to_be32(1);
        args.rets = &args.args[3];