4.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Bjorn Andersson <bjorn.anders...@linaro.org>

commit 7012040576c6ae25a47035659ee48673612c2c27 upstream.

When freeing the fw_priv the item is taken off the list. This causes an
oops in the FW_OPT_NOCACHE case as the list object is not initialized.

Make sure to initialize the list object regardless of this flag.

Fixes: 422b3db2a503 ("firmware: Fix security issue with 
request_firmware_into_buf()")
Cc: sta...@vger.kernel.org
Cc: Rishabh Bhatnagar <risha...@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.anders...@linaro.org>
Reviewed-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/base/firmware_loader/main.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -226,8 +226,11 @@ static int alloc_lookup_fw_priv(const ch
        }
 
        tmp = __allocate_fw_priv(fw_name, fwc, dbuf, size);
-       if (tmp && !(opt_flags & FW_OPT_NOCACHE))
-               list_add(&tmp->list, &fwc->head);
+       if (tmp) {
+               INIT_LIST_HEAD(&tmp->list);
+               if (!(opt_flags & FW_OPT_NOCACHE))
+                       list_add(&tmp->list, &fwc->head);
+       }
        spin_unlock(&fwc->lock);
 
        *fw_priv = tmp;


Reply via email to