[PATCH 1/2] hwrng: intel - return -ENOMEM when ioremap() fails

[PATCH 1/2] hwrng: intel - return -ENOMEM when ioremap() fails

[Thorsten Blum]

intel_init_hw_struct() incorrectly returns -EBUSY when ioremap() fails.
Return -ENOMEM instead.

Fixes: 641dd002d207 ("[PATCH] fix Intel RNG detection")
Signed-off-by: Thorsten Blum <blum@kernel.org>
---
 drivers/char/hw_random/intel-rng.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
index d24e747203c1..a4dd21a9de98 100644
--- a/drivers/char/hw_random/intel-rng.c
+++ b/drivers/char/hw_random/intel-rng.c
@@ -318,8 +318,8 @@ PFX "RNG, try using the 'no_fwh_detect' option.\n";
 	}
 
 	intel_rng_hw->mem = ioremap(INTEL_FWH_ADDR, INTEL_FWH_ADDR_LEN);
-	if (intel_rng_hw->mem == NULL)
-		return -EBUSY;
+	if (!intel_rng_hw->mem)
+		return -ENOMEM;
 
 	return 0;
 }

[PATCH 2/2] hwrng: intel - return -ENOMEM when kmalloc_obj() fails

[Thorsten Blum]

intel_rng_mod_init() incorrectly returns -ENODEV when kmalloc_obj()
fails. Return -ENOMEM instead.

Fixes: ee527cd3a20c ("Use stop_machine_run in the Intel RNG driver")
Signed-off-by: Thorsten Blum <blum@kernel.org>
---
 drivers/char/hw_random/intel-rng.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
index a4dd21a9de98..f7f734881c68 100644
--- a/drivers/char/hw_random/intel-rng.c
+++ b/drivers/char/hw_random/intel-rng.c
@@ -349,6 +349,7 @@ static int __init intel_rng_mod_init(void)
 	intel_rng_hw = kmalloc_obj(*intel_rng_hw);
 	if (!intel_rng_hw) {
 		pci_dev_put(dev);
+		err = -ENOMEM;
 		goto out;
 	}
 

Re: [PATCH 1/2] hwrng: intel - return -ENOMEM when ioremap() fails

[Herbert Xu]

On Tue, Sep 22, 2026 at 08:11:01PM +0200, Thorsten Blum wrote:
> intel_init_hw_struct() incorrectly returns -EBUSY when ioremap() fails.
> Return -ENOMEM instead.
> 
> Fixes: 641dd002d207 ("[PATCH] fix Intel RNG detection")

This commit ID appears to be incorrect (but the subject is correct).

Thanks,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: [PATCH 2/2] hwrng: intel - return -ENOMEM when kmalloc_obj() fails

[Herbert Xu]

On Tue, Sep 22, 2026 at 08:11:02PM +0200, Thorsten Blum wrote:
> intel_rng_mod_init() incorrectly returns -ENODEV when kmalloc_obj()
> fails. Return -ENOMEM instead.
> 
> Fixes: ee527cd3a20c ("Use stop_machine_run in the Intel RNG driver")
> Signed-off-by: Thorsten Blum <blum@kernel.org>
> ---
>  drivers/char/hw_random/intel-rng.c | 1 +
>  1 file changed, 1 insertion(+)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: [PATCH 1/2] hwrng: intel - return -ENOMEM when ioremap() fails

[Thorsten Blum]

On Fri, Oct 02, 2026 at 05:21:50PM +1000, Herbert Xu wrote:
> On Tue, Sep 22, 2026 at 08:11:01PM +0200, Thorsten Blum wrote:
> > intel_init_hw_struct() incorrectly returns -EBUSY when ioremap() fails.
> > Return -ENOMEM instead.
> > 
> > Fixes: 641dd002d207 ("[PATCH] fix Intel RNG detection")
> 
> This commit ID appears to be incorrect (but the subject is correct).

The commit ID is from stable, in mainline it is:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c24c95a085c6b52c11c2f5afecc38b0ca143cdae

The correct tag is therefore:

Fixes: c24c95a085c6 ("[PATCH] fix Intel RNG detection")

Should I submit a v2 or can you apply it like this?

Thanks,
Thorsten