1 files changed, 14 insertions, 4 deletions

diff --git a/net/rxrpc/ar-recvmsg.c b/net/rxrpc/ar-recvmsg.c
index 64facba24a45..160f0927aa3e 100644
--- a/net/rxrpc/ar-recvmsg.c
+++ b/net/rxrpc/ar-recvmsg.c
@@ -288,7 +288,11 @@ receive_non_data_message:
                 ret = put_cmsg(msg, SOL_RXRPC, RXRPC_BUSY, 0, &abort_code);
                 break;
         case RXRPC_SKB_MARK_REMOTE_ABORT:
-                abort_code = call->abort_code;
+                abort_code = call->remote_abort;
+                ret = put_cmsg(msg, SOL_RXRPC, RXRPC_ABORT, 4, &abort_code);
+                break;
+        case RXRPC_SKB_MARK_LOCAL_ABORT:
+                abort_code = call->local_abort;
                 ret = put_cmsg(msg, SOL_RXRPC, RXRPC_ABORT, 4, &abort_code);
                 break;
         case RXRPC_SKB_MARK_NET_ERROR:
@@ -303,6 +307,7 @@ receive_non_data_message:
                                &abort_code);
                 break;
         default:
+                pr_err("RxRPC: Unknown packet mark %u\n", skb->mark);
                 BUG();
                 break;
         }
@@ -401,9 +406,14 @@ u32 rxrpc_kernel_get_abort_code(struct sk_buff *skb)
 {
         struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
 
-        ASSERTCMP(skb->mark, ==, RXRPC_SKB_MARK_REMOTE_ABORT);
-
-        return sp->call->abort_code;
+        switch (skb->mark) {
+        case RXRPC_SKB_MARK_REMOTE_ABORT:
+                return sp->call->remote_abort;
+        case RXRPC_SKB_MARK_LOCAL_ABORT:
+                return sp->call->local_abort;
+        default:
+                BUG();
+        }
 }
 
 EXPORT_SYMBOL(rxrpc_kernel_get_abort_code);