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

Commit 9e79ec11 authored by Sam Liddicott's avatar Sam Liddicott Committed by Todd Kjos
Browse files

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: default avatarSam Liddicott <sam@liddicott.com>
Bug: 196046570
Test: passed netd test suites
Fixes: 10cda83af99d ("ANDROID: netfilter: xt_quota2: adding the
original quota2 from xtables-addons")
Signed-off-by: default avatarTodd Kjos <tkjos@google.com>
(cherry picked from https://git.code.sf.net/p/xtables-addons/xtables-addons
bc2bcc383c70b293bd816c29523a952ca8736fb5)
Change-Id: I965448564906e5fbf0fe6d6414f44d9e257ea195
parent 532ef022

net/netfilter/xt_quota2.c

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,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);