queue-4.19/acpi-nfit-fix-bus-command-validation.patch

   1 From ebe9f6f19d80d8978d16078dff3d5bd93ad8d102 Mon Sep 17 00:00:00 2001
   2 From: Dan Williams <dan.j.williams@intel.com>
   3 Date: Thu, 7 Feb 2019 14:56:50 -0800
   4 Subject: acpi/nfit: Fix bus command validation
   5
   6 From: Dan Williams <dan.j.williams@intel.com>
   7
   8 commit ebe9f6f19d80d8978d16078dff3d5bd93ad8d102 upstream.
   9
  10 Commit 11189c1089da "acpi/nfit: Fix command-supported detection" broke
  11 ND_CMD_CALL for bus-level commands. The "func = cmd" assumption is only
  12 valid for:
  13
  14     ND_CMD_ARS_CAP
  15     ND_CMD_ARS_START
  16     ND_CMD_ARS_STATUS
  17     ND_CMD_CLEAR_ERROR
  18
  19 The function number otherwise needs to be pulled from the command
  20 payload for:
  21
  22     NFIT_CMD_TRANSLATE_SPA
  23     NFIT_CMD_ARS_INJECT_SET
  24     NFIT_CMD_ARS_INJECT_CLEAR
  25     NFIT_CMD_ARS_INJECT_GET
  26
  27 Update cmd_to_func() for the bus case and call it in the common path.
  28
  29 Fixes: 11189c1089da ("acpi/nfit: Fix command-supported detection")
  30 Cc: <stable@vger.kernel.org>
  31 Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>
  32 Reported-by: Grzegorz Burzynski <grzegorz.burzynski@intel.com>
  33 Tested-by: Jeff Moyer <jmoyer@redhat.com>
  34 Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  35 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  36
  37 ---
  38  drivers/acpi/nfit/core.c |   22 ++++++++++++----------
  39  1 file changed, 12 insertions(+), 10 deletions(-)
  40
  41 --- a/drivers/acpi/nfit/core.c
  42 +++ b/drivers/acpi/nfit/core.c
  43 @@ -397,7 +397,7 @@ static int cmd_to_func(struct nfit_mem *
  44         if (call_pkg) {
  45                 int i;
  46
  47 -               if (nfit_mem->family != call_pkg->nd_family)
  48 +               if (nfit_mem && nfit_mem->family != call_pkg->nd_family)
  49                         return -ENOTTY;
  50
  51                 for (i = 0; i < ARRAY_SIZE(call_pkg->nd_reserved2); i++)
  52 @@ -406,6 +406,10 @@ static int cmd_to_func(struct nfit_mem *
  53                 return call_pkg->nd_command;
  54         }
  55
  56 +       /* In the !call_pkg case, bus commands == bus functions */
  57 +       if (!nfit_mem)
  58 +               return cmd;
  59 +
  60         /* Linux ND commands == NVDIMM_FAMILY_INTEL function numbers */
  61         if (nfit_mem->family == NVDIMM_FAMILY_INTEL)
  62                 return cmd;
  63 @@ -436,17 +440,18 @@ int acpi_nfit_ctl(struct nvdimm_bus_desc
  64         if (cmd_rc)
  65                 *cmd_rc = -EINVAL;
  66
  67 +       if (cmd == ND_CMD_CALL)
  68 +               call_pkg = buf;
  69 +       func = cmd_to_func(nfit_mem, cmd, call_pkg);
  70 +       if (func < 0)
  71 +               return func;
  72 +
  73         if (nvdimm) {
  74                 struct acpi_device *adev = nfit_mem->adev;
  75
  76                 if (!adev)
  77                         return -ENOTTY;
  78
  79 -               if (cmd == ND_CMD_CALL)
  80 -                       call_pkg = buf;
  81 -               func = cmd_to_func(nfit_mem, cmd, call_pkg);
  82 -               if (func < 0)
  83 -                       return func;
  84                 dimm_name = nvdimm_name(nvdimm);
  85                 cmd_name = nvdimm_cmd_name(cmd);
  86                 cmd_mask = nvdimm_cmd_mask(nvdimm);
  87 @@ -457,12 +462,9 @@ int acpi_nfit_ctl(struct nvdimm_bus_desc
  88         } else {
  89                 struct acpi_device *adev = to_acpi_dev(acpi_desc);
  90
  91 -               func = cmd;
  92                 cmd_name = nvdimm_bus_cmd_name(cmd);
  93                 cmd_mask = nd_desc->cmd_mask;
  94 -               dsm_mask = cmd_mask;
  95 -               if (cmd == ND_CMD_CALL)
  96 -                       dsm_mask = nd_desc->bus_dsm_mask;
  97 +               dsm_mask = nd_desc->bus_dsm_mask;
  98                 desc = nd_cmd_bus_desc(cmd);
  99                 guid = to_nfit_uuid(NFIT_DEV_BUS);
 100                 handle = adev->handle;