X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=net%2Frxrpc%2Far-recvmsg.c;h=60c2b94e6b547855e52c92f21046e9786b767e59;hb=3b885787ea4112eaa80945999ea0901bf742707f;hp=f19121d4795b25cbb687459741e318ce76091989;hpb=651350d10f93bed7003c9a66e24cf25e0f8eed3d;p=linux-2.6-block.git diff --git a/net/rxrpc/ar-recvmsg.c b/net/rxrpc/ar-recvmsg.c index f19121d4795b..60c2b94e6b54 100644 --- a/net/rxrpc/ar-recvmsg.c +++ b/net/rxrpc/ar-recvmsg.c @@ -143,9 +143,10 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock, /* copy the peer address and timestamp */ if (!continue_call) { if (msg->msg_name && msg->msg_namelen > 0) - memcpy(&msg->msg_name, &call->conn->trans->peer->srx, + memcpy(msg->msg_name, + &call->conn->trans->peer->srx, sizeof(call->conn->trans->peer->srx)); - sock_recv_timestamp(msg, &rx->sk, skb); + sock_recv_ts_and_drops(msg, &rx->sk, skb); } /* receive the message */