diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-09-19 05:16:45 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-09-19 05:54:35 +0200 |
commit | ba717fc654c1ecfe5f731f43f7c83800e8a1c296 (patch) | |
tree | cd8fef0666bc0ec526fa9fec0fddb60db7cd064e /src | |
parent | receive: use netif_receive_skb instead of netif_rx (diff) | |
download | wireguard-monolithic-historical-ba717fc654c1ecfe5f731f43f7c83800e8a1c296.tar.xz wireguard-monolithic-historical-ba717fc654c1ecfe5f731f43f7c83800e8a1c296.zip |
queueing: no need to memzero struct
Diffstat (limited to 'src')
-rw-r--r-- | src/queueing.h | 2 | ||||
-rw-r--r-- | src/receive.c | 3 | ||||
-rw-r--r-- | src/send.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/queueing.h b/src/queueing.h index 30df3a8..48607a1 100644 --- a/src/queueing.h +++ b/src/queueing.h @@ -52,10 +52,10 @@ struct crypt_ctx { struct sk_buff_head packets; struct sk_buff *skb; }; + atomic_t is_finished; struct wireguard_peer *peer; struct noise_keypair *keypair; struct endpoint endpoint; - atomic_t is_finished; }; /* Returns either the correct skb->protocol value, or 0 if invalid. */ diff --git a/src/receive.c b/src/receive.c index efe53f4..0f4545b 100644 --- a/src/receive.c +++ b/src/receive.c @@ -389,13 +389,14 @@ static void packet_consume_data(struct wireguard_device *wg, struct sk_buff *skb return; } - ctx = kmem_cache_zalloc(crypt_ctx_cache, GFP_ATOMIC); + ctx = kmem_cache_alloc(crypt_ctx_cache, GFP_ATOMIC); if (unlikely(!ctx)) { dev_kfree_skb(skb); peer_put(ctx->keypair->entry.peer); noise_keypair_put(keypair); return; } + atomic_set(&ctx->is_finished, false); ctx->keypair = keypair; ctx->skb = skb; /* We already have a reference to peer from index_hashtable_lookup. */ @@ -229,12 +229,13 @@ static void packet_create_data(struct wireguard_peer *peer, struct sk_buff_head struct crypt_ctx *ctx; struct wireguard_device *wg = peer->device; - ctx = kmem_cache_zalloc(crypt_ctx_cache, GFP_ATOMIC); + ctx = kmem_cache_alloc(crypt_ctx_cache, GFP_ATOMIC); if (unlikely(!ctx)) { skb_queue_purge(packets); goto err_drop_refs; } /* This function consumes the passed references to peer and keypair. */ + atomic_set(&ctx->is_finished, false); ctx->keypair = keypair; ctx->peer = peer; __skb_queue_head_init(&ctx->packets); |