2018-06-12 03:10:15

by Zhouyang Jia

[permalink] [raw]
Subject: [PATCH] ipack: add error handling for ioremap_nocache

When ioremap_nocache fails, the lack of error-handling code may
cause unexpected results.

This patch adds error-handling code after calling ioremap_nocache.

Signed-off-by: Zhouyang Jia <[email protected]>
---
drivers/ipack/carriers/tpci200.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/drivers/ipack/carriers/tpci200.c b/drivers/ipack/carriers/tpci200.c
index 9b23843..1612f51 100644
--- a/drivers/ipack/carriers/tpci200.c
+++ b/drivers/ipack/carriers/tpci200.c
@@ -304,6 +304,13 @@ static int tpci200_register(struct tpci200_board *tpci200)
ioremap_nocache(pci_resource_start(tpci200->info->pdev,
TPCI200_IP_INTERFACE_BAR),
TPCI200_IFACE_SIZE);
+ if (!tpci200->info->interface_regs) {
+ dev_err(&tpci200->info->pdev->dev,
+ "(bn 0x%X, sn 0x%X) failed to map driver user space!",
+ tpci200->info->pdev->bus->number,
+ tpci200->info->pdev->devfn);
+ goto out_release_mem8_space;
+ }

/* Initialize lock that protects interface_regs */
spin_lock_init(&tpci200->regs_lock);
--
2.7.4



2018-06-12 06:35:12

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] ipack: add error handling for ioremap_nocache

On Tue, Jun 12, 2018 at 07:00:55AM +0200, Samuel Iglesias Gons?lvez wrote:
> Hello Markus,
>
> Thanks for the patch!
>
> Patch is,
>
> Acked-by: Samuel Iglesias Gonsalvez <[email protected]>
>
> Greg, Would you mind picking this patch series through your char-misc
> tree?

Will do after 4.18-rc1 is out, thanks.

greg k-h