diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-08-01 15:35:42 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-08-01 19:24:04 +0200 |
| commit | 13f19049ed1e19b26e80e0b549744a4ca2c44443 (patch) | |
| tree | 421deb4f6d06a1d90acd9b5326a9ec583d5b0d86 /src/queueing.h | |
| parent | allowedips: free root inside of RCU callback (diff) | |
| download | wireguard-monolithic-historical-13f19049ed1e19b26e80e0b549744a4ca2c44443.tar.xz wireguard-monolithic-historical-13f19049ed1e19b26e80e0b549744a4ca2c44443.zip | |
queueing: keep reference to peer after setting atomic state bit
After we atomic_set, the peer is allowed to be freed, which means if we
want to continue to reference it, we need to bump the reference count.
This was introduced a few commits ago by b713ab0e when implementing some
simplification suggestions.
Diffstat (limited to 'src/queueing.h')
| -rw-r--r-- | src/queueing.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/queueing.h b/src/queueing.h index 3fb7b5c..4967eef 100644 --- a/src/queueing.h +++ b/src/queueing.h @@ -132,14 +132,18 @@ static inline int queue_enqueue_per_device_and_peer(struct crypt_queue *device_q static inline void queue_enqueue_per_peer(struct crypt_queue *queue, struct sk_buff *skb, enum packet_state state) { + struct wireguard_peer *peer = peer_get(PACKET_PEER(skb)); atomic_set(&PACKET_CB(skb)->state, state); - queue_work_on(cpumask_choose_online(&PACKET_PEER(skb)->serial_work_cpu, PACKET_PEER(skb)->internal_id), PACKET_PEER(skb)->device->packet_crypt_wq, &queue->work); + queue_work_on(cpumask_choose_online(&peer->serial_work_cpu, peer->internal_id), peer->device->packet_crypt_wq, &queue->work); + peer_put(peer); } static inline void queue_enqueue_per_peer_napi(struct crypt_queue *queue, struct sk_buff *skb, enum packet_state state) { + struct wireguard_peer *peer = peer_get(PACKET_PEER(skb)); atomic_set(&PACKET_CB(skb)->state, state); - napi_schedule(&PACKET_PEER(skb)->napi); + napi_schedule(&peer->napi); + peer_put(peer); } #ifdef DEBUG |