linux-kernel - Re: [PATCH v3 5/5] firmware: fix fw cache to avoid usermode helper on suspend

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 31 Aug 2016 09:03:53 +0200
From:   Daniel Wagner <wagi@...om.org>
To:     mcgrof@...nel.org, ming.lei@...onical.com,
        akpm@...ux-foundation.org, gregkh@...uxfoundation.org
Cc:     daniel.wagner@...-carit.de, mmarek@...e.com,
        linux-kernel@...r.kernel.org, markivx@...eaurora.org,
        stephen.boyd@...aro.org, zohar@...ux.vnet.ibm.com,
        broonie@...nel.org, tiwai@...e.de, johannes@...solutions.net,
        chunkeey@...glemail.com, hauke@...ke-m.de,
        jwboyer@...oraproject.org, dmitry.torokhov@...il.com,
        dwmw2@...radead.org, jslaby@...e.com,
        torvalds@...ux-foundation.org, luto@...capital.net,
        fengguang.wu@...el.com, rpurdie@...ys.net,
        j.anaszewski@...sung.com, Abhay_Salunke@...l.com,
        Julia.Lawall@...6.fr, Gilles.Muller@...6.fr, nicolas.palix@...g.fr,
        teg@...m.no, dhowells@...hat.com, bjorn.andersson@...aro.org,
        arend.vanspriel@...adcom.com, kvalo@...eaurora.org
Subject: Re: [PATCH v3 5/5] firmware: fix fw cache to avoid usermode helper on
 suspend

Hi Luis,

On 08/24/2016 02:45 AM, mcgrof@...nel.org wrote:
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index 22d1760a4278..dca4f9cbf4db 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -1412,7 +1412,7 @@ static int cache_firmware(const char *fw_name)
>
>  	pr_debug("%s: %s\n", __func__, fw_name);
>
> -	ret = request_firmware(&fw, fw_name, NULL);
> +	ret = request_firmware_direct(&fw, fw_name, NULL);
>  	if (!ret)
>  		kfree(fw);
>
>

While you are at it you should kill this here as well:

@@ -1622,7 +1637,6 @@ static void __device_uncache_fw_images(void)
  static void device_cache_fw_images(void)
  {
  	struct firmware_cache *fwc = &fw_cache;
-	int old_timeout;
  	DEFINE_WAIT(wait);

  	pr_debug("%s\n", __func__);
@@ -1630,17 +1644,6 @@ static void device_cache_fw_images(void)
  	/* cancel uncache work */
  	cancel_delayed_work_sync(&fwc->work);

-	/*
-	 * use small loading timeout for caching devices' firmware
-	 * because all these firmware images have been loaded
-	 * successfully at lease once, also system is ready for
-	 * completing firmware loading now. The maximum size of
-	 * firmware in current distributions is about 2M bytes,
-	 * so 10 secs should be enough.
-	 */
-	old_timeout = loading_timeout;
-	loading_timeout = 10;
-
  	mutex_lock(&fw_lock);
  	fwc->state = FW_LOADER_START_CACHE;
  	dpm_for_each_dev(NULL, dev_cache_fw_image);
@@ -1648,8 +1651,6 @@ static void device_cache_fw_images(void)

  	/* wait for completion of caching firmware for all devices */
  	async_synchronize_full_domain(&fw_cache_domain);
-
-	loading_timeout = old_timeout;
  }

cheers,
daniel