Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d28cc81 authored by Christophe Leroy's avatar Christophe Leroy Committed by Scott Wood
Browse files

powerpc: handle error case in cpm_muram_alloc() 



rh_alloc() returns (unsigned long)-ERRxx on error, which may
result in overwriting memory outside the MURAM AREA.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent 9100d20c

arch/powerpc/sysdev/cpm_common.c

+2 −1
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ unsigned long cpm_muram_alloc(unsigned long size, unsigned long align) 
	spin_lock_irqsave(&cpm_muram_lock, flags);

	cpm_muram_info.alignment = align;

	start = rh_alloc(&cpm_muram_info, size, "commproc");

	if (!IS_ERR_VALUE(start))

		memset_io(cpm_muram_addr(start), 0, size);

	spin_unlock_irqrestore(&cpm_muram_lock, flags);