| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Fri, 5 May 2017 08:34:58 +0300 |
| Subject: cxl: Unlock on error in probe |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| |
| [ Upstream commit 58d876fa7181f2f393190c1d32c056b5a9d34aa2 ] |
| |
| We should unlock if get_cxl_adapter() fails. |
| |
| Fixes: 594ff7d067ca ("cxl: Support to flash a new image on the adapter from a guest") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Acked-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/misc/cxl/flash.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/misc/cxl/flash.c |
| +++ b/drivers/misc/cxl/flash.c |
| @@ -401,8 +401,10 @@ static int device_open(struct inode *ino |
| if (down_interruptible(&sem) != 0) |
| return -EPERM; |
| |
| - if (!(adapter = get_cxl_adapter(adapter_num))) |
| - return -ENODEV; |
| + if (!(adapter = get_cxl_adapter(adapter_num))) { |
| + rc = -ENODEV; |
| + goto err_unlock; |
| + } |
| |
| file->private_data = adapter; |
| continue_token = 0; |
| @@ -446,6 +448,8 @@ err1: |
| free_page((unsigned long) le); |
| err: |
| put_device(&adapter->dev); |
| +err_unlock: |
| + up(&sem); |
| |
| return rc; |
| } |
