rds: Incorrect rds-info send and retransmission message output

Function rds_conn_message_info_cmn() does not skip IPv6 connections if
the request is for IPv4 connections only.  This causes an IPv6 address
to be printed out as an IPv4 address (using only the last 32 bits).

Orabug: 28898827

Signed-off-by: Ka-Cheong Poon <[email protected]>
Reviewed-by: Håkon Bugge <[email protected]>

Orabug: 33590097

UEK6 => UEK7

(cherry picked from commit 8b6537b)
cherry-pick-repo=UEK/production/linux-uek.git

Signed-off-by: Gerd Rausch <[email protected]>
Reviewed-by: William Kucharski <[email protected]>

Author: kcp-git

net/rds/connection.c

@@ -576,15 +576,16 @@ EXPORT_SYMBOL_GPL(rds_conn_destroy);
 
 static void __rds_inc_msg_cp(struct rds_incoming *inc,
 			     struct rds_info_iterator *iter,
-			     void *saddr, void *daddr, int flip, bool isv6)
+			     struct in6_addr *saddr, struct in6_addr *daddr,
+			     int flip, bool isv6)
 {
 #if IS_ENABLED(CONFIG_IPV6)
 	if (isv6)
 		rds6_inc_info_copy(inc, iter, saddr, daddr, flip);
 	else
 #endif
-		rds_inc_info_copy(inc, iter, *(__be32 *)saddr,
-				  *(__be32 *)daddr, flip);
+		rds_inc_info_copy(inc, iter, saddr->s6_addr32[3],
+				  daddr->s6_addr32[3], flip);
 }
 
 static void rds_conn_message_info_cmn(struct socket *sock, unsigned int len,
@@ -614,6 +615,9 @@ static void rds_conn_message_info_cmn(struct socket *sock, unsigned int len,
 			struct rds_conn_path *cp;
 			int npaths;
 
+			if (!isv6 && conn->c_isv6)
+				continue;
+
 			npaths = (conn->c_trans->t_mp_capable ?
 				 RDS_MPATH_WORKERS : 1);