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

Commit dd8fa7ce authored by David Collins's avatar David Collins
Browse files

spmi: spmi-pmic-arb: block access for invalid PMIC arbiter v5 SPMI writes 



The system crashes due to an access permission violation when
writing to a PMIC peripheral which is not owned by the current
ee.  Add a check for PMIC arbiter version 5 for such invalid
write requests and return an error instead of crashing the
system.

Change-Id: If601a8c737f10be2a7d1e894f7285cf0de4eb4a5
Signed-off-by: default avatarDavid Collins <collinsd@codeaurora.org>
parent b4695fbf

drivers/spmi/spmi-pmic-arb.c

+6 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2015, 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1006,6 +1006,11 @@ static int pmic_arb_offset_v5(struct spmi_pmic_arb *pmic_arb, u8 sid, u16 addr, 
		offset = 0x10000 * pmic_arb->ee + 0x80 * apid;

		break;

	case PMIC_ARB_CHANNEL_RW:

		if (pmic_arb->apid_data[apid].write_ee != pmic_arb->ee) {

			dev_err(&pmic_arb->spmic->dev, "disallowed SPMI write to sid=%u, addr=0x%04X\n",

				sid, addr);

			return -EPERM;

		}

		offset = 0x10000 * apid;

		break;

	}