patch "serial: amba-pl011: Fix devm_ioremap_resource return value check" added to tty-linus

This is a note to let you know that I've just added the patch titled

serial: amba-pl011: Fix devm_ioremap_resource return value check

to my tty git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
in the tty-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

From: Krzysztof Kozlowski <[email protected]>
Date: Thu, 9 Jul 2015 22:21:41 +0900
Subject: serial: amba-pl011: Fix devm_ioremap_resource return value check

Value returned by devm_ioremap_resource() was checked for non-NULL but devm_ioremap_resource() returns IOMEM_ERR_PTR, not NULL. In case of error this could lead to dereference of ERR_PTR.

---
 drivers/tty/serial/amba-pl011.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 50cf5b10ceed..fd27e986b1dd 100644
@@ -2310,8 +2310,8 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap,
 	void __iomem *base;
 
 	base = devm_ioremap_resource(dev, mmiobase);
-	if (!base)
-		return -ENOMEM;
+	if (IS_ERR(base))
+		return PTR_ERR(base);
 
 	index = pl011_probe_dt_alias(index, dev);
 

2.4.6