diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2017-06-22 15:29:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-23 14:08:40 -0400 |
| commit | 0ccc22f425e56c4ede9c66f1945846de8ac1f352 (patch) | |
| tree | 096fe914e9a99b0bf3feefae7825a20a02f9b6ef /net/ipv6 | |
| parent | a5cb659bbc1c8644efa0c3138a757a1e432a4880 (diff) | |
| download | linux-0ccc22f425e56c4ede9c66f1945846de8ac1f352.tar.gz linux-0ccc22f425e56c4ede9c66f1945846de8ac1f352.tar.bz2 linux-0ccc22f425e56c4ede9c66f1945846de8ac1f352.zip | |
sit: use __GFP_NOWARN for user controlled allocation
The memory allocation size is controlled by user-space,
if it is too large just fail silently and return NULL,
not to mention there is a fallback allocation later.
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/sit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 2378503577b0..f8ad15891cd7 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -305,7 +305,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t, * we try harder to allocate. */ kp = (cmax <= 1 || capable(CAP_NET_ADMIN)) ? - kcalloc(cmax, sizeof(*kp), GFP_KERNEL) : + kcalloc(cmax, sizeof(*kp), GFP_KERNEL | __GFP_NOWARN) : NULL; rcu_read_lock(); |