| Message ID | 20170505053458.csrwd2kjber44r4o@mwanda (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 58d876fa7181f2f393190c1d32c056b5a9d34aa2 |
| Headers | show |
Le 05/05/2017 à 07:34, Dan Carpenter a écrit : > 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> Thanks! Fred > diff --git a/drivers/misc/cxl/flash.c b/drivers/misc/cxl/flash.c > index 7c61c70ba3f6..37475abea3e6 100644 > --- a/drivers/misc/cxl/flash.c > +++ b/drivers/misc/cxl/flash.c > @@ -401,8 +401,10 @@ static int device_open(struct inode *inode, struct file *file) > 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 @@ static int device_open(struct inode *inode, struct file *file) > free_page((unsigned long) le); > err: > put_device(&adapter->dev); > +err_unlock: > + up(&sem); > > return rc; > } >
On Fri, 2017-05-05 at 05:34:58 UTC, Dan Carpenter wrote: > 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> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/58d876fa7181f2f393190c1d32c056 cheers
diff --git a/drivers/misc/cxl/flash.c b/drivers/misc/cxl/flash.c index 7c61c70ba3f6..37475abea3e6 100644 --- a/drivers/misc/cxl/flash.c +++ b/drivers/misc/cxl/flash.c @@ -401,8 +401,10 @@ static int device_open(struct inode *inode, struct file *file) 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 @@ static int device_open(struct inode *inode, struct file *file) free_page((unsigned long) le); err: put_device(&adapter->dev); +err_unlock: + up(&sem); return rc; }
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>