| Message ID | 1528190181-15745-1-git-send-email-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2e5c93d6bb2f7bc17eb82748943a1b9f6b068520 |
| Headers | show |
| Series | [-next] ocxl: Fix missing unlock on error in afu_ioctl_enable_p9_wait() | expand |
> -----Original Message----- > From: Wei Yongjun <weiyongjun1@huawei.com> > Sent: Tuesday, 5 June 2018 7:16 PM > To: Frederic Barrat <fbarrat@linux.vnet.ibm.com>; Andrew Donnellan > <andrew.donnellan@au1.ibm.com>; Arnd Bergmann <arnd@arndb.de>; > Greg Kroah-Hartman <gregkh@linuxfoundation.org>; Alastair D'Silva > <alastair@d-silva.org> > Cc: Wei Yongjun <weiyongjun1@huawei.com>; linuxppc- > dev@lists.ozlabs.org; linux-kernel@vger.kernel.org; kernel- > janitors@vger.kernel.org > Subject: [PATCH -next] ocxl: Fix missing unlock on error in > afu_ioctl_enable_p9_wait() > > Add the missing unlock before return from function > afu_ioctl_enable_p9_wait() in the error handling case. > > Fixes: e948e06fc63a ("ocxl: Expose the thread_id needed for wait on > POWER9") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/misc/ocxl/file.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index > 33ae46c..e6a6074 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -139,8 +139,10 @@ static long afu_ioctl_enable_p9_wait(struct > ocxl_context *ctx, > // Locks both status & tidr > mutex_lock(&ctx->status_mutex); > if (!ctx->tidr) { > - if (set_thread_tidr(current)) > + if (set_thread_tidr(current)) { > + mutex_unlock(&ctx->status_mutex); > return -ENOENT; > + } > > ctx->tidr = current->thread.tidr; > } Thanks for picking that up! Reviewed-by: Alastair D'Silva <alastair@d-silva.org>
Le 05/06/2018 à 11:16, Wei Yongjun a écrit : > Add the missing unlock before return from function > afu_ioctl_enable_p9_wait() in the error handling case. > > Fixes: e948e06fc63a ("ocxl: Expose the thread_id needed for wait on POWER9") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/misc/ocxl/file.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index 33ae46c..e6a6074 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -139,8 +139,10 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > // Locks both status & tidr > mutex_lock(&ctx->status_mutex); > if (!ctx->tidr) { > - if (set_thread_tidr(current)) > + if (set_thread_tidr(current)) { > + mutex_unlock(&ctx->status_mutex); > return -ENOENT; > + } O_o Thanks for fixing it Acked-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com> > ctx->tidr = current->thread.tidr; > } >
On Tue, 2018-06-05 at 09:16:21 UTC, Wei Yongjun wrote: > Add the missing unlock before return from function > afu_ioctl_enable_p9_wait() in the error handling case. > > Fixes: e948e06fc63a ("ocxl: Expose the thread_id needed for wait on POWER9") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > Reviewed-by: Alastair D'Silva <alastair@d-silva.org> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/2e5c93d6bb2f7bc17eb82748943a1b cheers
diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index 33ae46c..e6a6074 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -139,8 +139,10 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, // Locks both status & tidr mutex_lock(&ctx->status_mutex); if (!ctx->tidr) { - if (set_thread_tidr(current)) + if (set_thread_tidr(current)) { + mutex_unlock(&ctx->status_mutex); return -ENOENT; + } ctx->tidr = current->thread.tidr; }
Add the missing unlock before return from function afu_ioctl_enable_p9_wait() in the error handling case. Fixes: e948e06fc63a ("ocxl: Expose the thread_id needed for wait on POWER9") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/misc/ocxl/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)