Patch "SUNRPC: Fix infinite looping in rpc_clnt_iterate_for_each_xprt" has been added to the 4.7-stable tree

This is a note to let you know that I've just added the patch titled

SUNRPC: Fix infinite looping in rpc_clnt_iterate_for_each_xprt

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
sunrpc-fix-infinite-looping-in-rpc_clnt_iterate_for_each_xprt.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Trond Myklebust <[email protected]>
Date: Sat, 16 Jul 2016 11:47:00 -0400
Subject: SUNRPC: Fix infinite looping in rpc_clnt_iterate_for_each_xprt

From: Trond Myklebust <[email protected]>

commit bdc54d8e3cb4a41dddcabfd86d9eb3aa5f622b75 upstream.

If there were less than 2 entries in the multipath list, then xprt_iter_next_entry_multiple() would never advance beyond the first entry, which is correct for round robin behaviour, but not for the list iteration.

The end result would be infinite looping in rpc_clnt_iterate_for_each_xprt() as we would never see the xprt == NULL condition fulfilled.

---
 net/sunrpc/xprtmultipath.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

@@ -271,14 +271,12 @@ struct rpc_xprt *xprt_iter_next_entry_mu
 		xprt_switch_find_xprt_t find_next)
 {
 	struct rpc_xprt_switch *xps = rcu_dereference(xpi->xpi_xpswitch);
-	struct list_head *head;
 
 	if (xps == NULL)
 		return NULL;
-	head = &xps->xps_xprt_list;
-	if (xps->xps_nxprts < 2)
-		return xprt_switch_find_first_entry(head);
-	return xprt_switch_set_next_cursor(head, &xpi->xpi_cursor, find_next);
+	return xprt_switch_set_next_cursor(&xps->xps_xprt_list,
+			&xpi->xpi_cursor,
+			find_next);
 }
 
 static

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/sunrpc-fix-infinite-looping-in-rpc_clnt_iterate_for_each_xprt.patch queue-4.7/sunrpc-handle-eaddrnotavail-on-connection-failures.patch queue-4.7/sunrpc-allow-for-upcalls-for-same-uid-but-different-gss-service.patch