Commit 6beb3381 authored Aug 27, 2018 by Christophe Leroy Committed by Michael Ellerman Oct 20, 2018

powerpc/sysdev/ipic: check primary_ipic NULL pointer before using it



ipic_get_mcp_status() is used by targets implementing NMI
watchdog in target specific machine check handler in order
to known whether a machine check results from a watchdog
NMI reset.

In case of very early machine check, primary_ipic pointer
might not have been set yet, so ipic_get_mcp_status() needs
to check it for nullity before using it.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 37e9c674

arch/powerpc/sysdev/ipic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -846,7 +846,7 @@ void ipic_disable_mcp(enum ipic_mcp_irq mcp_irq)

		u32 ipic_get_mcp_status(void)
		{
		return ipic_read(primary_ipic->regs, IPIC_SERSR);
		return primary_ipic ? ipic_read(primary_ipic->regs, IPIC_SERSR) : 0;
		}

		void ipic_clear_mcp_status(u32 mask)