On Wed, Feb 3, 2016 at 11:06 AM, Mimi Zohar <zohar at linux.vnet.ibm.com> wrote:
> From: "Luis R. Rodriguez" <mcgrof at kernel.org>
>
> This will be re-used later through a new extensible interface.
>
> Reviewed-by: Josh Boyer <jwboyer at fedoraproject.org>
> Signed-off-by: Luis R. Rodriguez <mcgrof at kernel.org>
> Signed-off-by: Mimi Zohar <zohar at linux.vnet.ibm.com>
Acked-by: Kees Cook <keescook at chromium.org>
-Kees
> ---
> drivers/base/firmware_class.c | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index 3358f5d..fb64814 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -322,6 +322,15 @@ fail:
> return rc;
> }
>
> +static void fw_finish_direct_load(struct device *device,
> + struct firmware_buf *buf)
> +{
> + mutex_lock(&fw_lock);
> + set_bit(FW_STATUS_DONE, &buf->status);
> + complete_all(&buf->completion);
> + mutex_unlock(&fw_lock);
> +}
> +
> static int fw_get_filesystem_firmware(struct device *device,
> struct firmware_buf *buf)
> {
> @@ -363,10 +372,7 @@ static int fw_get_filesystem_firmware(struct device *device,
> if (!rc) {
> dev_dbg(device, "direct-loading %s\n",
> buf->fw_id);
> - mutex_lock(&fw_lock);
> - set_bit(FW_STATUS_DONE, &buf->status);
> - complete_all(&buf->completion);
> - mutex_unlock(&fw_lock);
> + fw_finish_direct_load(device, buf);
> }
>
> return rc;
> --
> 2.1.0
>
--
Kees Cook
Chrome OS & Brillo Security
