iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mei: hbm: fix client dma reply status

Browse Source 
commit 6b0b80ac10 upstream.

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: 369aea8459 ("mei: implement client dma setup.")
Cc: <stable@vger.kernel.org> # v5.11+
Reported-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Tested-by: : Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Link: https://lore.kernel.org/r/20211228082047.378115-1-tomas.winkler@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Usyskin
2021-12-28 10:20:47 +02:00
committed by Greg Kroah-Hartman
parent 697c413757
commit 702c890452
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/misc/mei/hbm.c
View File

@ -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,
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);
} }