platform/x86: dell_rbu: fix lock imbalance in img_update_realloc

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>
Acked-by: Stuart Hayes <stuart.w.hayes@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>

diff --git a/drivers/platform/x86/dell_rbu.c b/drivers/platform/x86/dell_rbu.c
index 8104ca0c44caa888fb85c4598c68545f0bdbb91d..031c689035837e453736837c9f289088a9a5ce6c 100644 (file)
--- 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;