All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shakeel Butt <shakeelb@google.com>
To: Pablo Neira Ayuso <pablo@netfilter.org>,
	Florian Westphal <fw@strlen.de>,
	Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>,
	Roopa Prabhu <roopa@cumulusnetworks.com>,
	Nikolay Aleksandrov <nikolay@cumulusnetworks.com>,
	Michal Hocko <mhocko@suse.com>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org, netfilter-devel@vger.kernel.org,
	coreteam@netfilter.org, bridge@lists.linux-foundation.org,
	linux-kernel@vger.kernel.org, Shakeel Butt <shakeelb@google.com>,
	syzbot+7713f3aa67be76b1552c@syzkaller.appspotmail.com
Subject: [PATCH] netfilter: account ebt_table_info to kmemcg
Date: Fri, 28 Dec 2018 17:55:24 -0800	[thread overview]
Message-ID: <20181229015524.222741-1-shakeelb@google.com> (raw)

The [ip,ip6,arp]_tables use x_tables_info internally and the underlying
memory is already accounted to kmemcg. Do the same for ebtables. The
syzbot, by using setsockopt(EBT_SO_SET_ENTRIES), was able to OOM the
whole system from a restricted memcg, a potential DoS.

Reported-by: syzbot+7713f3aa67be76b1552c@syzkaller.appspotmail.com
Signed-off-by: Shakeel Butt <shakeelb@google.com>
---
 net/bridge/netfilter/ebtables.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 491828713e0b..5e55cef0cec3 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1137,14 +1137,16 @@ static int do_replace(struct net *net, const void __user *user,
 	tmp.name[sizeof(tmp.name) - 1] = 0;
 
 	countersize = COUNTER_OFFSET(tmp.nentries) * nr_cpu_ids;
-	newinfo = vmalloc(sizeof(*newinfo) + countersize);
+	newinfo = __vmalloc(sizeof(*newinfo) + countersize, GFP_KERNEL_ACCOUNT,
+			    PAGE_KERNEL);
 	if (!newinfo)
 		return -ENOMEM;
 
 	if (countersize)
 		memset(newinfo->counters, 0, countersize);
 
-	newinfo->entries = vmalloc(tmp.entries_size);
+	newinfo->entries = __vmalloc(tmp.entries_size, GFP_KERNEL_ACCOUNT,
+				     PAGE_KERNEL);
 	if (!newinfo->entries) {
 		ret = -ENOMEM;
 		goto free_newinfo;
-- 
2.20.1.415.g653613c723-goog


WARNING: multiple messages have this Message-ID (diff)
From: Shakeel Butt <shakeelb@google.com>
To: Pablo Neira Ayuso <pablo@netfilter.org>,
	Florian Westphal <fw@strlen.de>,
	Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>,
	Roopa Prabhu <roopa@cumulusnetworks.com>,
	Nikolay Aleksandrov <nikolay@cumulusnetworks.com>,
	Michal Hocko <mhocko@suse.com>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: bridge@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
	linux-mm@kvack.org, coreteam@netfilter.org,
	netfilter-devel@vger.kernel.org,
	syzbot+7713f3aa67be76b1552c@syzkaller.appspotmail.com,
	Shakeel Butt <shakeelb@google.com>
Subject: [Bridge] [PATCH] netfilter: account ebt_table_info to kmemcg
Date: Fri, 28 Dec 2018 17:55:24 -0800	[thread overview]
Message-ID: <20181229015524.222741-1-shakeelb@google.com> (raw)

The [ip,ip6,arp]_tables use x_tables_info internally and the underlying
memory is already accounted to kmemcg. Do the same for ebtables. The
syzbot, by using setsockopt(EBT_SO_SET_ENTRIES), was able to OOM the
whole system from a restricted memcg, a potential DoS.

Reported-by: syzbot+7713f3aa67be76b1552c@syzkaller.appspotmail.com
Signed-off-by: Shakeel Butt <shakeelb@google.com>
---
 net/bridge/netfilter/ebtables.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 491828713e0b..5e55cef0cec3 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1137,14 +1137,16 @@ static int do_replace(struct net *net, const void __user *user,
 	tmp.name[sizeof(tmp.name) - 1] = 0;
 
 	countersize = COUNTER_OFFSET(tmp.nentries) * nr_cpu_ids;
-	newinfo = vmalloc(sizeof(*newinfo) + countersize);
+	newinfo = __vmalloc(sizeof(*newinfo) + countersize, GFP_KERNEL_ACCOUNT,
+			    PAGE_KERNEL);
 	if (!newinfo)
 		return -ENOMEM;
 
 	if (countersize)
 		memset(newinfo->counters, 0, countersize);
 
-	newinfo->entries = vmalloc(tmp.entries_size);
+	newinfo->entries = __vmalloc(tmp.entries_size, GFP_KERNEL_ACCOUNT,
+				     PAGE_KERNEL);
 	if (!newinfo->entries) {
 		ret = -ENOMEM;
 		goto free_newinfo;
-- 
2.20.1.415.g653613c723-goog


             reply	other threads:[~2018-12-29  1:56 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-29  1:55 Shakeel Butt [this message]
2018-12-29  1:55 ` [Bridge] [PATCH] netfilter: account ebt_table_info to kmemcg Shakeel Butt
2018-12-29  1:55 ` Shakeel Butt
2018-12-29  7:33 ` Michal Hocko
2018-12-29  7:33   ` [Bridge] " Michal Hocko
2018-12-29  9:52   ` Florian Westphal
2018-12-29  9:52     ` [Bridge] " Florian Westphal
2018-12-29 10:06     ` Michal Hocko
2018-12-29 10:06       ` [Bridge] " Michal Hocko
2018-12-29 19:34       ` Shakeel Butt
2018-12-29 19:34         ` [Bridge] " Shakeel Butt
2018-12-29 19:34         ` Shakeel Butt
2018-12-30  7:45         ` Michal Hocko
2018-12-30  7:45           ` [Bridge] " Michal Hocko
2018-12-30  8:00           ` Michal Hocko
2018-12-30  8:00             ` [Bridge] " Michal Hocko
2018-12-31  3:59             ` Shakeel Butt
2018-12-31  3:59               ` [Bridge] " Shakeel Butt
2018-12-31  3:59               ` Shakeel Butt
2018-12-31 10:11               ` Michal Hocko
2018-12-31 10:11                 ` [Bridge] " Michal Hocko
2019-01-03 20:52                 ` Shakeel Butt
2019-01-03 20:52                   ` [Bridge] " Shakeel Butt
2019-01-03 20:52                   ` Shakeel Butt
2019-01-04 13:21                   ` Michal Hocko
2019-01-04 13:21                     ` [Bridge] " Michal Hocko
2018-12-31  4:00           ` Shakeel Butt
2018-12-31  4:00             ` [Bridge] " Shakeel Butt
2018-12-31  4:00             ` Shakeel Butt
2018-12-29  9:52   ` Kirill Tkhai
2018-12-29  9:52     ` [Bridge] " Kirill Tkhai
2018-12-29 19:39     ` Shakeel Butt
2018-12-29 19:39       ` [Bridge] " Shakeel Butt
2018-12-29 19:39       ` Shakeel Butt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181229015524.222741-1-shakeelb@google.com \
    --to=shakeelb@google.com \
    --cc=akpm@linux-foundation.org \
    --cc=bridge@lists.linux-foundation.org \
    --cc=coreteam@netfilter.org \
    --cc=fw@strlen.de \
    --cc=kadlec@blackhole.kfki.hu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mhocko@suse.com \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=nikolay@cumulusnetworks.com \
    --cc=pablo@netfilter.org \
    --cc=roopa@cumulusnetworks.com \
    --cc=syzbot+7713f3aa67be76b1552c@syzkaller.appspotmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.