[PATCH] firmware: Always initialize the fw_priv list object

* [PATCH] firmware: Always initialize the fw_priv list object
@ 2018-09-20  1:09 Bjorn Andersson
  2018-09-20  5:22 ` Greg Kroah-Hartman
  2018-09-20  7:38 ` Rafael J. Wysocki
  0 siblings, 2 replies; 9+ messages in thread
From: Bjorn Andersson @ 2018-09-20  1:09 UTC (permalink / raw)
  To: Luis R. Rodriguez, Greg Kroah-Hartman
  Cc: Rafael J. Wysocki, linux-kernel, linux-arm-msm, stable,
	Rishabh Bhatnagar

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: stable@vger.kernel.org
Cc: Rishabh Bhatnagar <rishabhb@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/base/firmware_loader/main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
index b3c0498ee433..8e9213b36e31 100644
--- 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 char *fw_name,
 	}
 
 	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;
-- 
2.18.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread