1 files changed, 31 insertions, 25 deletions

diff --git a/net/rxrpc/ar-accept.c b/net/rxrpc/ar-accept.c
index 6d79310fcaae..277731a5e67a 100644
--- a/net/rxrpc/ar-accept.c
+++ b/net/rxrpc/ar-accept.c
@@ -27,7 +27,7 @@
  * generate a connection-level abort
  */
 static int rxrpc_busy(struct rxrpc_local *local, struct sockaddr_rxrpc *srx,
-                      struct rxrpc_header *hdr)
+                      struct rxrpc_wire_header *whdr)
 {
         struct msghdr msg;
         struct kvec iov[1];
@@ -36,25 +36,21 @@ static int rxrpc_busy(struct rxrpc_local *local, struct sockaddr_rxrpc *srx,
 
         _enter("%d,,", local->debug_id);
 
+        whdr->type      = RXRPC_PACKET_TYPE_BUSY;
+        whdr->serial    = htonl(1);
+
         msg.msg_name    = &srx->transport.sin;
         msg.msg_namelen = sizeof(srx->transport.sin);
         msg.msg_control = NULL;
         msg.msg_controllen = 0;
         msg.msg_flags   = 0;
 
-        hdr->seq        = 0;
-        hdr->type       = RXRPC_PACKET_TYPE_BUSY;
-        hdr->flags      = 0;
-        hdr->userStatus = 0;
-        hdr->_rsvd      = 0;
-
-        iov[0].iov_base = hdr;
-        iov[0].iov_len  = sizeof(*hdr);
+        iov[0].iov_base = whdr;
+        iov[0].iov_len  = sizeof(*whdr);
 
         len = iov[0].iov_len;
 
-        hdr->serial = htonl(1);
-        _proto("Tx BUSY %%%u", ntohl(hdr->serial));
+        _proto("Tx BUSY %%1");
 
         ret = kernel_sendmsg(local->socket, &msg, iov, 1, len);
         if (ret < 0) {
@@ -185,8 +181,8 @@ invalid_service:
         read_unlock_bh(&local->services_lock);
 
         read_lock_bh(&call->state_lock);
-        if (!test_bit(RXRPC_CALL_RELEASE, &call->flags) &&
-            !test_and_set_bit(RXRPC_CALL_RELEASE, &call->events)) {
+        if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
+            !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events)) {
                 rxrpc_get_call(call);
                 rxrpc_queue_call(call);
         }
@@ -211,8 +207,8 @@ void rxrpc_accept_incoming_calls(struct work_struct *work)
         struct rxrpc_skb_priv *sp;
         struct sockaddr_rxrpc srx;
         struct rxrpc_sock *rx;
+        struct rxrpc_wire_header whdr;
         struct sk_buff *skb;
-        __be16 service_id;
         int ret;
 
         _enter("%d", local->debug_id);
@@ -240,6 +236,19 @@ process_next_packet:
 
         sp = rxrpc_skb(skb);
 
+        /* Set up a response packet header in case we need it */
+        whdr.epoch      = htonl(sp->hdr.epoch);
+        whdr.cid        = htonl(sp->hdr.cid);
+        whdr.callNumber = htonl(sp->hdr.callNumber);
+        whdr.seq        = htonl(sp->hdr.seq);
+        whdr.serial     = 0;
+        whdr.flags      = 0;
+        whdr.type       = 0;
+        whdr.userStatus = 0;
+        whdr.securityIndex = sp->hdr.securityIndex;
+        whdr._rsvd      = 0;
+        whdr.serviceId  = htons(sp->hdr.serviceId);
+
         /* determine the remote address */
         memset(&srx, 0, sizeof(srx));
         srx.srx_family = AF_RXRPC;
@@ -256,10 +265,9 @@ process_next_packet:
         }
 
         /* get the socket providing the service */
-        service_id = sp->hdr.serviceId;
         read_lock_bh(&local->services_lock);
         list_for_each_entry(rx, &local->services, listen_link) {
-                if (rx->service_id == service_id &&
+                if (rx->srx.srx_service == sp->hdr.serviceId &&
                     rx->sk.sk_state != RXRPC_CLOSE)
                         goto found_service;
         }
@@ -267,7 +275,7 @@ process_next_packet:
         goto invalid_service;
 
 found_service:
-        _debug("found service %hd", ntohs(rx->service_id));
+        _debug("found service %hd", rx->srx.srx_service);
         if (sk_acceptq_is_full(&rx->sk))
                 goto backlog_full;
         sk_acceptq_added(&rx->sk);
@@ -296,7 +304,7 @@ found_service:
 backlog_full:
         read_unlock_bh(&local->services_lock);
 busy:
-        rxrpc_busy(local, &srx, &sp->hdr);
+        rxrpc_busy(local, &srx, &whdr);
         rxrpc_free_skb(skb);
         goto process_next_packet;
 
@@ -379,7 +387,7 @@ struct rxrpc_call *rxrpc_accept_call(struct rxrpc_sock *rx,
         rb_insert_color(&call->sock_node, &rx->calls);
         if (test_and_set_bit(RXRPC_CALL_HAS_USERID, &call->flags))
                 BUG();
-        if (test_and_set_bit(RXRPC_CALL_ACCEPTED, &call->events))
+        if (test_and_set_bit(RXRPC_CALL_EV_ACCEPTED, &call->events))
                 BUG();
         rxrpc_queue_call(call);
 
@@ -395,7 +403,7 @@ struct rxrpc_call *rxrpc_accept_call(struct rxrpc_sock *rx,
 out_release:
         _debug("release %p", call);
         if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
-            !test_and_set_bit(RXRPC_CALL_RELEASE, &call->events))
+            !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events))
                 rxrpc_queue_call(call);
 out_discard:
         write_unlock_bh(&call->state_lock);
@@ -407,7 +415,7 @@ out:
 }
 
 /*
- * handle rejectance of a call by userspace
+ * Handle rejection of a call by userspace
  * - reject the call at the front of the queue
  */
 int rxrpc_reject_call(struct rxrpc_sock *rx)
@@ -434,7 +442,7 @@ int rxrpc_reject_call(struct rxrpc_sock *rx)
         switch (call->state) {
         case RXRPC_CALL_SERVER_ACCEPTING:
                 call->state = RXRPC_CALL_SERVER_BUSY;
-                if (test_and_set_bit(RXRPC_CALL_REJECT_BUSY, &call->events))
+                if (test_and_set_bit(RXRPC_CALL_EV_REJECT_BUSY, &call->events))
                         rxrpc_queue_call(call);
                 ret = 0;
                 goto out_release;
@@ -458,7 +466,7 @@ int rxrpc_reject_call(struct rxrpc_sock *rx)
 out_release:
         _debug("release %p", call);
         if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
-            !test_and_set_bit(RXRPC_CALL_RELEASE, &call->events))
+            !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events))
                 rxrpc_queue_call(call);
 out_discard:
         write_unlock_bh(&call->state_lock);
@@ -487,7 +495,6 @@ struct rxrpc_call *rxrpc_kernel_accept_call(struct socket *sock,
         _leave(" = %p", call);
         return call;
 }
-
 EXPORT_SYMBOL(rxrpc_kernel_accept_call);
 
 /**
@@ -506,5 +513,4 @@ int rxrpc_kernel_reject_call(struct socket *sock)
         _leave(" = %d", ret);
         return ret;
 }
-
 EXPORT_SYMBOL(rxrpc_kernel_reject_call);