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

Commit 3c45e99c authored Oct 12, 2016 by Liam Mark Committed by Gerrit - the friendly Code Review server Nov 04, 2016

ion: disable system contig heap



A malicious application can take advantage of the ION contig heap to
create a specific memory chunk size to exercise a rowhammer attack on the
physical hardware.
So remove support for the ION contig heap.

Change-Id: I9cb454cebb74df291479cecc3533d2c684363f77
Signed-off-by: Liam Mark <lmark@codeaurora.org>
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>

parent ef6c4f46

arch/arm/boot/dts/qcom/msm8909-ion.dtsi

+0 −5

Original line number	Diff line number	Diff line
		@@ -21,11 +21,6 @@
		qcom,ion-heap-type = "SYSTEM";
		};

		qcom,ion-heap@21 {
		reg = <21>;
		qcom,ion-heap-type = "SYSTEM_CONTIG";
		};

		qcom,ion-heap@27 { /* QSEECOM HEAP */
		reg = <27>;
		memory-region = <&venus_qseecom_mem>;

arch/arm/boot/dts/qcom/msm8917-ion.dtsi

+1 −6

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-2016, 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
		@@ -22,11 +22,6 @@
		qcom,ion-heap-type = "SYSTEM";
		};

		qcom,ion-heap@21 {
		reg = <21>;
		qcom,ion-heap-type = "SYSTEM_CONTIG";
		};

		qcom,ion-heap@8 { /* CP_MM HEAP */
		reg = <8>;
		memory-region = <&secure_mem>;

arch/arm/boot/dts/qcom/msm8937-ion.dtsi

+1 −6

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-2016, 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
		@@ -22,11 +22,6 @@
		qcom,ion-heap-type = "SYSTEM";
		};

		qcom,ion-heap@21 {
		reg = <21>;
		qcom,ion-heap-type = "SYSTEM_CONTIG";
		};

		qcom,ion-heap@8 { /* CP_MM HEAP */
		reg = <8>;
		memory-region = <&secure_mem>;

arch/arm/boot/dts/qcom/msm8952-ion.dtsi

+1 −6

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2016, 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
		@@ -21,11 +21,6 @@
		qcom,ion-heap-type = "SYSTEM";
		};

		qcom,ion-heap@21 {
		reg = <21>;
		qcom,ion-heap-type = "SYSTEM_CONTIG";
		};

		qcom,ion-heap@8 { /* CP_MM HEAP */
		reg = <8>;
		memory-region = <&secure_mem>;

arch/arm/boot/dts/qcom/msm8953-ion.dtsi

+0 −5

Original line number	Diff line number	Diff line
		@@ -21,11 +21,6 @@
		qcom,ion-heap-type = "SYSTEM";
		};

		qcom,ion-heap@21 {
		reg = <21>;
		qcom,ion-heap-type = "SYSTEM_CONTIG";
		};

		qcom,ion-heap@8 { /* CP_MM HEAP */
		reg = <8>;
		memory-region = <&secure_mem>;