diff options
| author | Or Gerlitz <ogerlitz@mellanox.com> | 2014-01-29 18:08:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-30 16:25:48 -0800 |
| commit | b5aaab12b2b4bc4acab7384c17a87f3406e5047d (patch) | |
| tree | c07e22943f2c0a05c3cde04f162b9b32cf95200f /net/ipv4/udp_offload.c | |
| parent | f8d56d8f892be43a2404356073e16401eb5a42e6 (diff) | |
| download | op-kernel-dev-b5aaab12b2b4bc4acab7384c17a87f3406e5047d.zip op-kernel-dev-b5aaab12b2b4bc4acab7384c17a87f3406e5047d.tar.gz | |
net/ipv4: Use non-atomic allocation of udp offloads structure instance
Since udp_add_offload() can be called from non-sleepable context e.g
under this call tree from the vxlan driver use case:
vxlan_socket_create() <-- holds the spinlock
-> vxlan_notify_add_rx_port()
-> udp_add_offload() <-- schedules
we should allocate the udp_offloads structure in atomic manner.
Fixes: b582ef0 ('net: Add GRO support for UDP encapsulating protocols')
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp_offload.c')
| -rw-r--r-- | net/ipv4/udp_offload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index 25f5cee..2ffea6f 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -101,7 +101,7 @@ out: int udp_add_offload(struct udp_offload *uo) { struct udp_offload_priv __rcu **head = &udp_offload_base; - struct udp_offload_priv *new_offload = kzalloc(sizeof(*new_offload), GFP_KERNEL); + struct udp_offload_priv *new_offload = kzalloc(sizeof(*new_offload), GFP_ATOMIC); if (!new_offload) return -ENOMEM; |
