projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
netfilter: ipset: Fix sleeping memory allocation in atomic context
[cascardo/linux.git]
/
net
/
netfilter
/
ipset
/
ip_set_list_set.c
diff --git
a/net/netfilter/ipset/ip_set_list_set.c
b/net/netfilter/ipset/ip_set_list_set.c
index
a1fe537
..
5a30ce6
100644
(file)
--- a/
net/netfilter/ipset/ip_set_list_set.c
+++ b/
net/netfilter/ipset/ip_set_list_set.c
@@
-297,7
+297,7
@@
list_set_uadd(struct ip_set *set, void *value, const struct ip_set_ext *ext,
ip_set_timeout_expired(ext_timeout(n, set))))
n = NULL;
- e = kzalloc(set->dsize, GFP_
KERNEL
);
+ e = kzalloc(set->dsize, GFP_
ATOMIC
);
if (!e)
return -ENOMEM;
e->id = d->id;