Commit 70120405 authored Sep 19, 2018 by Bjorn Andersson Committed by Greg Kroah-Hartman Sep 30, 2018

firmware: Always initialize the fw_priv list object

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: 422b3db2 ("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>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 492ecf6d

drivers/base/firmware_loader/main.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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))
		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;