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 027/238] nfit: acpi_nfit_ctl(): Check out_obj->type in the right place
    Date
    5.0-stable review patch.  If anyone has any objections, please let me know.

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

    From: Dexuan Cui <decui@microsoft.com>

    commit 43f89877f26671c6309cd87d7364b1a3e66e71cf upstream.

    In the case of ND_CMD_CALL, we should also check out_obj->type.

    The patch uses out_obj->type, which is a short alias to
    out_obj->package.type.

    Fixes: 31eca76ba2fc ("nfit, libnvdimm: limited/whitelisted dimm command marshaling mechanism")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Dexuan Cui <decui@microsoft.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 | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    --- a/drivers/acpi/nfit/core.c
    +++ b/drivers/acpi/nfit/core.c
    @@ -554,6 +554,13 @@ int acpi_nfit_ctl(struct nvdimm_bus_desc
    return -EINVAL;
    }

    + if (out_obj->type != ACPI_TYPE_BUFFER) {
    + dev_dbg(dev, "%s unexpected output object type cmd: %s type: %d\n",
    + dimm_name, cmd_name, out_obj->type);
    + rc = -EINVAL;
    + goto out;
    + }
    +
    if (call_pkg) {
    call_pkg->nd_fw_size = out_obj->buffer.length;
    memcpy(call_pkg->nd_payload + call_pkg->nd_size_in,
    @@ -572,13 +579,6 @@ int acpi_nfit_ctl(struct nvdimm_bus_desc
    return 0;
    }

    - if (out_obj->package.type != ACPI_TYPE_BUFFER) {
    - dev_dbg(dev, "%s unexpected output object type cmd: %s type: %d\n",
    - dimm_name, cmd_name, out_obj->type);
    - rc = -EINVAL;
    - goto out;
    - }
    -
    dev_dbg(dev, "%s cmd: %s output length: %d\n", dimm_name,
    cmd_name, out_obj->buffer.length);
    print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4, 4,

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