svc_register() assigns every pg_rpcbind_set() result to the same "error"
variable and returns the last one, so a later result erases an earlier
failure.

Keep the first error instead of the last.

Fixes: 642ee6b209c2 ("SUNRPC: Allow further customisation of RPC program 
registration")
Assisted-by: LLM
Signed-off-by: Jeff Layton <[email protected]>
---
 net/sunrpc/svc.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 8297bad2b177..4f402bbf97ba 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1208,13 +1208,16 @@ int svc_register(const struct svc_serv *serv, struct 
net *net,
                struct svc_program *progp = &serv->sv_programs[p];
 
                for (i = 0; i < progp->pg_nvers; i++) {
+                       int ret;
 
-                       error = progp->pg_rpcbind_set(net, progp, i,
+                       ret = progp->pg_rpcbind_set(net, progp, i,
                                        family, proto, port);
-                       if (error < 0) {
+                       if (ret < 0) {
                                printk(KERN_WARNING "svc: failed to register "
                                        "%sv%u RPC service (errno %d).\n",
-                                       progp->pg_name, i, -error);
+                                       progp->pg_name, i, -ret);
+                               if (!error)
+                                       error = ret;
                                break;
                        }
                }

-- 
2.55.0


Reply via email to