* [patch (for 2.6.25?) 2/2] RxRPC: fix rxrpc_recvmsg()'s returning of msg_name
@ 2008-03-04 22:56 akpm
2008-03-06 2:54 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: akpm @ 2008-03-04 22:56 UTC (permalink / raw)
To: davem; +Cc: netdev, akpm, dhowells
From: David Howells <dhowells@redhat.com>
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>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
net/rxrpc/ar-recvmsg.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN net/rxrpc/ar-recvmsg.c~rxrpc-fix-rxrpc_recvmsgs-returning-of-msg_name net/rxrpc/ar-recvmsg.c
--- a/net/rxrpc/ar-recvmsg.c~rxrpc-fix-rxrpc_recvmsgs-returning-of-msg_name
+++ a/net/rxrpc/ar-recvmsg.c
@@ -143,7 +143,8 @@ int rxrpc_recvmsg(struct kiocb *iocb, st
/* 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);
}
_
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch (for 2.6.25?) 2/2] RxRPC: fix rxrpc_recvmsg()'s returning of msg_name
2008-03-04 22:56 [patch (for 2.6.25?) 2/2] RxRPC: fix rxrpc_recvmsg()'s returning of msg_name akpm
@ 2008-03-06 2:54 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2008-03-06 2:54 UTC (permalink / raw)
To: akpm; +Cc: netdev, dhowells
From: akpm@linux-foundation.org
Date: Tue, 04 Mar 2008 14:56:49 -0800
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-03-06 2:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-04 22:56 [patch (for 2.6.25?) 2/2] RxRPC: fix rxrpc_recvmsg()'s returning of msg_name akpm
2008-03-06 2:54 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).