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

Commit 7df56c25 authored by Roel Kluin's avatar Roel Kluin Committed by Eric Miao
Browse files

[ARM] pxa: ensure mfp is in correct range in mfp_{read,write} 



Ensure we do not read/write outside array boundaries with a negative index.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 10d5d99e

arch/arm/plat-pxa/mfp.c

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ unsigned long mfp_read(int mfp) 
{

	unsigned long val, flags;



	BUG_ON(mfp >= MFP_PIN_MAX);

	BUG_ON(mfp < 0 || mfp >= MFP_PIN_MAX);



	spin_lock_irqsave(&mfp_spin_lock, flags);

	val = mfpr_readl(mfp_table[mfp].mfpr_off);
@@ -220,7 +220,7 @@ void mfp_write(int mfp, unsigned long val) 
{

	unsigned long flags;



	BUG_ON(mfp >= MFP_PIN_MAX);

	BUG_ON(mfp < 0 || mfp >= MFP_PIN_MAX);



	spin_lock_irqsave(&mfp_spin_lock, flags);

	mfpr_writel(mfp_table[mfp].mfpr_off, val);