2 files changed, 20 insertions, 12 deletions

diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index d1389afc8342..02c522c17de5 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -212,12 +212,16 @@ xprt_rdma_format_addresses(struct rpc_xprt *xprt)
 static void
 xprt_rdma_free_addresses(struct rpc_xprt *xprt)
 {
-        kfree(xprt->address_strings[RPC_DISPLAY_ADDR]);
-        kfree(xprt->address_strings[RPC_DISPLAY_PORT]);
-        kfree(xprt->address_strings[RPC_DISPLAY_ALL]);
-        kfree(xprt->address_strings[RPC_DISPLAY_HEX_ADDR]);
-        kfree(xprt->address_strings[RPC_DISPLAY_HEX_PORT]);
-        kfree(xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR]);
+        unsigned int i;
+
+        for (i = 0; i < RPC_DISPLAY_MAX; i++)
+                switch (i) {
+                case RPC_DISPLAY_PROTO:
+                case RPC_DISPLAY_NETID:
+                        continue;
+                default:
+                        kfree(xprt->address_strings[i]);
+                }
 }
 
 static void
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index b9b94f49c620..30e7ac243a90 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -398,12 +398,16 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
 
 static void xs_free_peer_addresses(struct rpc_xprt *xprt)
 {
-        kfree(xprt->address_strings[RPC_DISPLAY_ADDR]);
-        kfree(xprt->address_strings[RPC_DISPLAY_PORT]);
-        kfree(xprt->address_strings[RPC_DISPLAY_ALL]);
-        kfree(xprt->address_strings[RPC_DISPLAY_HEX_ADDR]);
-        kfree(xprt->address_strings[RPC_DISPLAY_HEX_PORT]);
-        kfree(xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR]);
+        unsigned int i;
+
+        for (i = 0; i < RPC_DISPLAY_MAX; i++)
+                switch (i) {
+                case RPC_DISPLAY_PROTO:
+                case RPC_DISPLAY_NETID:
+                        continue;
+                default:
+                        kfree(xprt->address_strings[i]);
+                }
 }
 
 #define XS_SENDMSG_FLAGS        (MSG_DONTWAIT | MSG_NOSIGNAL)