From d3e20037cd255ffe97e64627566bf1d5d057d162 Mon Sep 17 00:00:00 2001 From: Mohammed Javid Date: Fri, 21 Sep 2018 11:42:40 +0530 Subject: [PATCH] msm: ipa: Protect ipa default routing table Protect ipa default routing table from addition, deletion and modification once after default rule added by ipa-driver. Change-Id: I045d9c29fed23edf796d826e440b81124e1f666a Signed-off-by: Mohammed Javid [haggertk: Backport to 3.4/msm8974] CVE-2018-13900 Signed-off-by: Kevin F. Haggerty --- drivers/platform/msm/ipa/ipa_rt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/platform/msm/ipa/ipa_rt.c b/drivers/platform/msm/ipa/ipa_rt.c index 5220ef22d48..a8499550017 100644 --- a/drivers/platform/msm/ipa/ipa_rt.c +++ b/drivers/platform/msm/ipa/ipa_rt.c @@ -611,13 +611,12 @@ static int __ipa_add_rt_rule(enum ipa_ip_type ip, const char *name, goto fail_rt_tbl_sanity; } /* - * do not allow any rules to be added at end of the "default" routing - * tables + * do not allow any rule to be added at "default" routing + * table */ if (!strncmp(tbl->name, IPA_DFLT_RT_TBL_NAME, IPA_RESOURCE_NAME_MAX) && - (tbl->rule_cnt > 0) && (at_rear != 0)) { - IPAERR("cannot add rule at end of tbl rule_cnt=%d at_rear=%d\n", - tbl->rule_cnt, at_rear); + (tbl->rule_cnt > 0)) { + IPAERR_RL("cannot add rules to default rt table\n"); goto fail_rt_tbl_sanity; }