lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 028/238] acpi/nfit: Fix bus command validation
    Date
    5.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Williams <dan.j.williams@intel.com>

    commit ebe9f6f19d80d8978d16078dff3d5bd93ad8d102 upstream.

    Commit 11189c1089da "acpi/nfit: Fix command-supported detection" broke
    ND_CMD_CALL for bus-level commands. The "func = cmd" assumption is only
    valid for:

    ND_CMD_ARS_CAP
    ND_CMD_ARS_START
    ND_CMD_ARS_STATUS
    ND_CMD_CLEAR_ERROR

    The function number otherwise needs to be pulled from the command
    payload for:

    NFIT_CMD_TRANSLATE_SPA
    NFIT_CMD_ARS_INJECT_SET
    NFIT_CMD_ARS_INJECT_CLEAR
    NFIT_CMD_ARS_INJECT_GET

    Update cmd_to_func() for the bus case and call it in the common path.

    Fixes: 11189c1089da ("acpi/nfit: Fix command-supported detection")
    Cc: <stable@vger.kernel.org>
    Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>
    Reported-by: Grzegorz Burzynski <grzegorz.burzynski@intel.com>
    Tested-by: Jeff Moyer <jmoyer@redhat.com>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/acpi/nfit/core.c | 22 ++++++++++++----------
    1 file changed, 12 insertions(+), 10 deletions(-)

    --- a/drivers/acpi/nfit/core.c
    +++ b/drivers/acpi/nfit/core.c
    @@ -415,7 +415,7 @@ static int cmd_to_func(struct nfit_mem *
    if (call_pkg) {
    int i;

    - if (nfit_mem->family != call_pkg->nd_family)
    + if (nfit_mem && nfit_mem->family != call_pkg->nd_family)
    return -ENOTTY;

    for (i = 0; i < ARRAY_SIZE(call_pkg->nd_reserved2); i++)
    @@ -424,6 +424,10 @@ static int cmd_to_func(struct nfit_mem *
    return call_pkg->nd_command;
    }

    + /* In the !call_pkg case, bus commands == bus functions */
    + if (!nfit_mem)
    + return cmd;
    +
    /* Linux ND commands == NVDIMM_FAMILY_INTEL function numbers */
    if (nfit_mem->family == NVDIMM_FAMILY_INTEL)
    return cmd;
    @@ -454,17 +458,18 @@ int acpi_nfit_ctl(struct nvdimm_bus_desc
    if (cmd_rc)
    *cmd_rc = -EINVAL;

    + if (cmd == ND_CMD_CALL)
    + call_pkg = buf;
    + func = cmd_to_func(nfit_mem, cmd, call_pkg);
    + if (func < 0)
    + return func;
    +
    if (nvdimm) {
    struct acpi_device *adev = nfit_mem->adev;

    if (!adev)
    return -ENOTTY;

    - if (cmd == ND_CMD_CALL)
    - call_pkg = buf;
    - func = cmd_to_func(nfit_mem, cmd, call_pkg);
    - if (func < 0)
    - return func;
    dimm_name = nvdimm_name(nvdimm);
    cmd_name = nvdimm_cmd_name(cmd);
    cmd_mask = nvdimm_cmd_mask(nvdimm);
    @@ -475,12 +480,9 @@ int acpi_nfit_ctl(struct nvdimm_bus_desc
    } else {
    struct acpi_device *adev = to_acpi_dev(acpi_desc);

    - func = cmd;
    cmd_name = nvdimm_bus_cmd_name(cmd);
    cmd_mask = nd_desc->cmd_mask;
    - dsm_mask = cmd_mask;
    - if (cmd == ND_CMD_CALL)
    - dsm_mask = nd_desc->bus_dsm_mask;
    + dsm_mask = nd_desc->bus_dsm_mask;
    desc = nd_cmd_bus_desc(cmd);
    guid = to_nfit_uuid(NFIT_DEV_BUS);
    handle = adev->handle;

    \
     
     \ /
      Last update: 2019-03-22 13:34    [W:4.103 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site