Commit 1ff82fe0 authored Mar 05, 2008 by David Howells Committed by David S. Miller Mar 05, 2008

RxRPC: fix rxrpc_recvmsg()'s returning of msg_name



Fix rxrpc_recvmsg() to return msg_name correctly.  We shouldn't
overwrite the *msg struct, but should rather write into msg->msg_name
(there's a '&' unary operator that shouldn't be there).

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 02ff05c4

net/rxrpc/ar-recvmsg.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,8 @@ 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);
		}