Attachment 1195439 Details for Bug 1371237 – Actually proper patch

[patch] Actually proper patch

kernel.patch (text/plain), 2.89 KB, created by Jason Tibbitts on 2016-08-29 16:53:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Tibbitts

Created: 2016-08-29 16:53:59 UTC

Size: 2.89 KB

patch

obsolete

>diff --git a/0001-SUNRPC-Fix-infinite-looping-in-rpc_clnt_iterate_for_.patch b/0001-SUNRPC-Fix-infinite-looping-in-rpc_clnt_iterate_for_.patch
>new file mode 100644
>index 0000000..0373d3a
>--- /dev/null
>+++ b/0001-SUNRPC-Fix-infinite-looping-in-rpc_clnt_iterate_for_.patch
>@@ -0,0 +1,46 @@
>+From bdc54d8e3cb4a41dddcabfd86d9eb3aa5f622b75 Mon Sep 17 00:00:00 2001
>+From: Trond Myklebust <trond.myklebust@primarydata.com>
>+Date: Sat, 16 Jul 2016 11:47:00 -0400
>+Subject: [PATCH] SUNRPC: Fix infinite looping in
>+ rpc_clnt_iterate_for_each_xprt
>+
>+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.
>+
>+Reported-by: Oleg Drokin <green@linuxhacker.ru>
>+Fixes: 80b14d5e61ca ("SUNRPC: Add a structure to track multiple transports")
>+Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
>+---
>+ net/sunrpc/xprtmultipath.c | 8 +++-----
>+ 1 file changed, 3 insertions(+), 5 deletions(-)
>+
>+diff --git a/net/sunrpc/xprtmultipath.c b/net/sunrpc/xprtmultipath.c
>+index e7fd769..66c9d63 100644
>+--- a/net/sunrpc/xprtmultipath.c
>++++ b/net/sunrpc/xprtmultipath.c
>+@@ -271,14 +271,12 @@ struct rpc_xprt *xprt_iter_next_entry_multiple(struct rpc_xprt_iter *xpi,
>+ 		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
>+-- 
>+2.7.4
>+
>diff --git a/kernel.spec b/kernel.spec
>index ff60881..d729253 100644
>--- a/kernel.spec
>+++ b/kernel.spec
>@@ -42,7 +42,7 @@ Summary: The Linux kernel
> # For non-released -rc kernels, this will be appended after the rcX and
> # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
> #
>-%global baserelease 201
>+%global baserelease 202
> %global fedora_build %{baserelease}
> 
> # base_sublevel is the kernel version we're starting with and patching
>@@ -637,6 +637,8 @@ Patch857: kernel-panic-TPROXY-vanilla-4.7.1.patch
> # lkml.kernel.org/r/<20160822093249.GA14916@dhcp22.suse.cz>
> Patch858: 0001-OOM-detection-regressions-since-4.7.patch
> 
>+Patch880: 0001-SUNRPC-Fix-infinite-looping-in-rpc_clnt_iterate_for_.patch
>+
> # END OF PATCH DEFINITIONS
> 
> %endif
>@@ -2164,6 +2166,9 @@ fi
> #
> # 
> %changelog
>+* Mon Aug 29 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 4.7.2-202
>+- Add patch to fix NFS client infinite loop.
>+
> * Sun Aug 28 2016 Peter Robinson <pbrobinson@fedoraproject.org>
> - Minor ARM updates
>

Actions: View | Diff

Attachments on bug 1371237: 1195438 | 1195439