]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
rxrpc: Don't transmit an ACK if there's no reason set
authorDavid Howells <dhowells@redhat.com>
Sat, 17 Sep 2016 09:49:13 +0000 (10:49 +0100)
committerDavid Howells <dhowells@redhat.com>
Sat, 17 Sep 2016 09:53:55 +0000 (10:53 +0100)
Don't transmit an ACK if call->ackr_reason in unset.  There's the
possibility of a race between recvmsg() sending an ACK and the background
processing thread trying to send the same one.

Signed-off-by: David Howells <dhowells@redhat.com>
net/rxrpc/output.c

index 06a9aca739d121ea2a1c784d218d171c55ef8ccb..aa0507214b3123bffe6ed13fb071a767f0f22099 100644 (file)
@@ -137,6 +137,11 @@ int rxrpc_send_call_packet(struct rxrpc_call *call, u8 type)
        switch (type) {
        case RXRPC_PACKET_TYPE_ACK:
                spin_lock_bh(&call->lock);
+               if (!call->ackr_reason) {
+                       spin_unlock_bh(&call->lock);
+                       ret = 0;
+                       goto out;
+               }
                n = rxrpc_fill_out_ack(call, pkt);
                call->ackr_reason = 0;