Commit 6b0b80ac authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman

mei: hbm: fix client dma reply status

Don't blindly copy status value received from the firmware
into internal client status field,
It may be positive and ERR_PTR(ret) will translate it
into an invalid address and the caller will crash.

Put the error code into the client status on failure.

Fixes: 369aea84 ("mei: implement client dma setup.")
Cc: <stable@vger.kernel.org> # v5.11+
Reported-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tested-by: default avatar: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Acked-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Link: https://lore.kernel.org/r/20211228082047.378115-1-tomas.winkler@intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fcee5ce5
...@@ -672,10 +672,14 @@ static void mei_hbm_cl_dma_map_res(struct mei_device *dev, ...@@ -672,10 +672,14 @@ static void mei_hbm_cl_dma_map_res(struct mei_device *dev,
if (!cl) if (!cl)
return; return;
dev_dbg(dev->dev, "cl dma map result = %d\n", res->status); if (res->status) {
cl->status = res->status; dev_err(dev->dev, "cl dma map failed %d\n", res->status);
if (!cl->status) cl->status = -EFAULT;
} else {
dev_dbg(dev->dev, "cl dma map succeeded\n");
cl->dma_mapped = 1; cl->dma_mapped = 1;
cl->status = 0;
}
wake_up(&cl->wait); wake_up(&cl->wait);
} }
...@@ -698,10 +702,14 @@ static void mei_hbm_cl_dma_unmap_res(struct mei_device *dev, ...@@ -698,10 +702,14 @@ static void mei_hbm_cl_dma_unmap_res(struct mei_device *dev,
if (!cl) if (!cl)
return; return;
dev_dbg(dev->dev, "cl dma unmap result = %d\n", res->status); if (res->status) {
cl->status = res->status; dev_err(dev->dev, "cl dma unmap failed %d\n", res->status);
if (!cl->status) cl->status = -EFAULT;
} else {
dev_dbg(dev->dev, "cl dma unmap succeeded\n");
cl->dma_mapped = 0; cl->dma_mapped = 0;
cl->status = 0;
}
wake_up(&cl->wait); wake_up(&cl->wait);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment