* [PATCH] platform/x86: dell_rbu: fix lock imbalance in img_update_realloc
@ 2019-02-11 13:09 Christoph Hellwig
2019-02-13 3:56 ` Stuart Hayes
0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2019-02-11 13:09 UTC (permalink / raw)
To: stuart.w.hayes, dvhart, andy
Cc: platform-driver-x86, linux-kernel, Dan Carpenter
We need to ensure rbu_data.lock is always held on return.
Fixes: 289790a3ea94 ("platform/x86: dell_rbu: stop abusing the DMA API")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/platform/x86/dell_rbu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/platform/x86/dell_rbu.c b/drivers/platform/x86/dell_rbu.c
index 8104ca0c44ca..031c68903583 100644
--- a/drivers/platform/x86/dell_rbu.c
+++ b/drivers/platform/x86/dell_rbu.c
@@ -436,6 +436,7 @@ static int img_update_realloc(unsigned long size)
ordernum = get_order(size);
image_update_buffer =
(unsigned char *)__get_free_pages(GFP_DMA32, ordernum);
+ spin_lock(&rbu_data.lock);
if (!image_update_buffer) {
pr_debug("Not enough memory for image update:"
"size = %ld\n", size);
@@ -446,7 +447,6 @@ static int img_update_realloc(unsigned long size)
if (WARN_ON_ONCE(img_buf_phys_addr > BIOS_SCAN_LIMIT))
return -EINVAL; /* can't happen per definition */
- spin_lock(&rbu_data.lock);
rbu_data.image_update_buffer = image_update_buffer;
rbu_data.image_update_buffer_size = size;
rbu_data.bios_image_size = rbu_data.image_update_buffer_size;
--
2.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] platform/x86: dell_rbu: fix lock imbalance in img_update_realloc
2019-02-11 13:09 [PATCH] platform/x86: dell_rbu: fix lock imbalance in img_update_realloc Christoph Hellwig
@ 2019-02-13 3:56 ` Stuart Hayes
2019-02-15 19:57 ` Andy Shevchenko
0 siblings, 1 reply; 3+ messages in thread
From: Stuart Hayes @ 2019-02-13 3:56 UTC (permalink / raw)
To: Christoph Hellwig, dvhart, andy
Cc: platform-driver-x86, linux-kernel, Dan Carpenter
On 2/11/2019 7:09 AM, Christoph Hellwig wrote:
> We need to ensure rbu_data.lock is always held on return.
>
> Fixes: 289790a3ea94 ("platform/x86: dell_rbu: stop abusing the DMA API")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> drivers/platform/x86/dell_rbu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/dell_rbu.c b/drivers/platform/x86/dell_rbu.c
> index 8104ca0c44ca..031c68903583 100644
> --- a/drivers/platform/x86/dell_rbu.c
> +++ b/drivers/platform/x86/dell_rbu.c
> @@ -436,6 +436,7 @@ static int img_update_realloc(unsigned long size)
> ordernum = get_order(size);
> image_update_buffer =
> (unsigned char *)__get_free_pages(GFP_DMA32, ordernum);
> + spin_lock(&rbu_data.lock);
> if (!image_update_buffer) {
> pr_debug("Not enough memory for image update:"
> "size = %ld\n", size);
> @@ -446,7 +447,6 @@ static int img_update_realloc(unsigned long size)
> if (WARN_ON_ONCE(img_buf_phys_addr > BIOS_SCAN_LIMIT))
> return -EINVAL; /* can't happen per definition */
>
> - spin_lock(&rbu_data.lock);
> rbu_data.image_update_buffer = image_update_buffer;
> rbu_data.image_update_buffer_size = size;
> rbu_data.bios_image_size = rbu_data.image_update_buffer_size;
>
Acked-by: Stuart Hayes <stuart.w.hayes@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] platform/x86: dell_rbu: fix lock imbalance in img_update_realloc
2019-02-13 3:56 ` Stuart Hayes
@ 2019-02-15 19:57 ` Andy Shevchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2019-02-15 19:57 UTC (permalink / raw)
To: Stuart Hayes
Cc: Christoph Hellwig, Darren Hart, Andy Shevchenko, Platform Driver,
Linux Kernel Mailing List, Dan Carpenter
On Wed, Feb 13, 2019 at 5:56 AM Stuart Hayes <stuart.w.hayes@gmail.com> wrote:
>
>
>
> On 2/11/2019 7:09 AM, Christoph Hellwig wrote:
> > We need to ensure rbu_data.lock is always held on return.
> >
Pushed to my review and testing queue, thanks!
> > Fixes: 289790a3ea94 ("platform/x86: dell_rbu: stop abusing the DMA API")
> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
> > ---
> > drivers/platform/x86/dell_rbu.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/platform/x86/dell_rbu.c b/drivers/platform/x86/dell_rbu.c
> > index 8104ca0c44ca..031c68903583 100644
> > --- a/drivers/platform/x86/dell_rbu.c
> > +++ b/drivers/platform/x86/dell_rbu.c
> > @@ -436,6 +436,7 @@ static int img_update_realloc(unsigned long size)
> > ordernum = get_order(size);
> > image_update_buffer =
> > (unsigned char *)__get_free_pages(GFP_DMA32, ordernum);
> > + spin_lock(&rbu_data.lock);
> > if (!image_update_buffer) {
> > pr_debug("Not enough memory for image update:"
> > "size = %ld\n", size);
> > @@ -446,7 +447,6 @@ static int img_update_realloc(unsigned long size)
> > if (WARN_ON_ONCE(img_buf_phys_addr > BIOS_SCAN_LIMIT))
> > return -EINVAL; /* can't happen per definition */
> >
> > - spin_lock(&rbu_data.lock);
> > rbu_data.image_update_buffer = image_update_buffer;
> > rbu_data.image_update_buffer_size = size;
> > rbu_data.bios_image_size = rbu_data.image_update_buffer_size;
> >
>
> Acked-by: Stuart Hayes <stuart.w.hayes@gmail.com>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-15 19:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-11 13:09 [PATCH] platform/x86: dell_rbu: fix lock imbalance in img_update_realloc Christoph Hellwig
2019-02-13 3:56 ` Stuart Hayes
2019-02-15 19:57 ` Andy Shevchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®