Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung...

[karo-tx-linux.git] / net / rds / recv.c

diff --git a/net/rds/recv.c b/net/rds/recv.c
index 5c6e9f1320266cf175ed55ea69e3a7c28437ce1b..9f0f17cf6bf9b16e95c7a89d1bc452a0e4c0aada 100644 (file)
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -410,6 +410,8 @@ int rds_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
 
        rdsdebug("size %zu flags 0x%x timeo %ld\n", size, msg_flags, timeo);
 
+       msg->msg_namelen = 0;
+
        if (msg_flags & MSG_OOB)
                goto out;
 
@@ -485,6 +487,7 @@ int rds_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
                        sin->sin_port = inc->i_hdr.h_sport;
                        sin->sin_addr.s_addr = inc->i_saddr;
                        memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
+                       msg->msg_namelen = sizeof(*sin);
                }
                break;
        }