From: Sam Liddicott <sam@liddicott.com>
Date: Tue, 7 Jan 2014 17:21:53 +0000 (-0800)
Subject: ANDROID: xt_quota2: remove trailing junk which might have a digit in it
X-Git-Tag: MMI-RSBS31.Q1-48-36-26~29
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2d5b2bfaebea3592ddeb736eb3a7aac620a06600;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ANDROID: xt_quota2: remove trailing junk which might have a digit in it

Make sure string only contains the characters specified by userspace.

Fix cherry-picked from xtables-extensions project

Signed-off-by: Sam Liddicott <sam@liddicott.com>

Mot-CRs-fixed: (CR)
CVE-Fixed: CVE-2021-0961

Bug: 196046570
Test: passed netd test suites
Fixes: 10cda83af99d ("ANDROID: netfilter: xt_quota2: adding the
original quota2 from xtables-addons")
Signed-off-by: Todd Kjos <tkjos@google.com>
(cherry picked from https://git.code.sf.net/p/xtables-addons/xtables-addons
bc2bcc383c70b293bd816c29523a952ca8736fb5)
Change-Id: I965448564906e5fbf0fe6d6414f44d9e257ea195
Signed-off-by: Gajjala Chakradhar <gajjalac@motorola.com>
Reviewed-on: https://gerrit.mot.com/2123622
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
(cherry picked from commit 625eb505d4c123adcc699c2a73aeec1390adf03c)
---

diff --git a/net/netfilter/xt_quota2.c b/net/netfilter/xt_quota2.c
index 24b774263aa6..75afbe20d0cb 100644
--- a/net/netfilter/xt_quota2.c
+++ b/net/netfilter/xt_quota2.c
@@ -162,6 +162,8 @@ static ssize_t quota_proc_write(struct file *file, const char __user *input,
 	if (copy_from_user(buf, input, size) != 0)
 		return -EFAULT;
 	buf[sizeof(buf)-1] = '\0';
+	if (size < sizeof(buf))
+		buf[size] = '\0';
 
 	spin_lock_bh(&e->lock);
 	e->quota = simple_strtoull(buf, NULL, 0);