powerpc/kexec_file: Fix error code when trying to load kdump kernel
authorThiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
Thu, 29 Mar 2018 19:05:43 +0000 (16:05 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Apr 2018 07:36:28 +0000 (09:36 +0200)
commit bf8a1abc3ddbd6e9a8312ea7d96e5dd89c140f18 upstream.

kexec_file_load() on powerpc doesn't support kdump kernels yet, so it
returns -ENOTSUPP in that case.

I've recently learned that this errno is internal to the kernel and
isn't supposed to be exposed to userspace. Therefore, change to
-EOPNOTSUPP which is defined in an uapi header.

This does indeed make kexec-tools happier. Before the patch, on
ppc64le:

  # ~bauermann/src/kexec-tools/build/sbin/kexec -s -p /boot/vmlinuz
  kexec_file_load failed: Unknown error 524

After the patch:

  # ~bauermann/src/kexec-tools/build/sbin/kexec -s -p /boot/vmlinuz
  kexec_file_load failed: Operation not supported

Fixes: a0458284f062 ("powerpc: Add support code for kexec_file_load()")
Cc: stable@vger.kernel.org # v4.10+
Reported-by: Dave Young <dyoung@redhat.com>
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
Reviewed-by: Simon Horman <horms@verge.net.au>
Reviewed-by: Dave Young <dyoung@redhat.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/kernel/machine_kexec_file_64.c

index 992c0d258e5d564c3b57526e968b26e78bb9292d..c66132b145ebc717d16334c280b9614d2d7bc48c 100644 (file)
@@ -43,7 +43,7 @@ int arch_kexec_kernel_image_probe(struct kimage *image, void *buf,
 
        /* We don't support crash kernels yet. */
        if (image->type == KEXEC_TYPE_CRASH)
-               return -ENOTSUPP;
+               return -EOPNOTSUPP;
 
        for (i = 0; i < ARRAY_SIZE(kexec_file_loaders); i++) {
                fops = kexec_file_loaders[i];