SUNRPC: attempt to reach rpcbind with an abstract socket name

NFS is primarily name-spaced using network namespaces.  However it
contacts rpcbind (and gss_proxy) using AF_UNIX sockets which are
name-spaced using the mount namespaces.  This requires a container using
NFSv3 (the form that requires rpcbind) to manage both network and mount
namespaces, which can seem an unnecessary burden.

As NFS is primarily a network service it makes sense to use network
namespaces as much as possible, and to prefer to communicate with an
rpcbind running in the same network namespace.  This can be done, while
preserving the benefits of AF_UNIX sockets, by using an abstract socket
address.

An abstract address has a nul at the start of sun_path, and a length
that is exactly the complete size of the sockaddr_un up to the end of
the name, NOT including any trailing nul (which is not part of the
address).
Abstract addresses are local to a network namespace - regular AF_UNIX
path names a resolved in the mount namespace ignoring the network
namespace.

This patch causes rpcb to first try an abstract address before
continuing with regular AF_UNIX and then IP addresses.  This ensures
backwards compatibility.

Choosing the name needs some care as the same address will be configured
for rpcbind, and needs to be built in to libtirpc for this enhancement
to be fully successful.  There is no formal standard for choosing
abstract addresses.  The defacto standard appears to be to use a path
name similar to what would be used for a filesystem AF_UNIX address -
but with a leading nul.

In that case
   "\0/var/run/rpcbind.sock"
seems like the best choice.  However at this time /var/run is deprecated
in favour of /run, so
   "\0/run/rpcbind.sock"
might be better.
Though as we are deliberately moving away from using the filesystem it
might seem more sensible to explicitly break the connection and just
have
   "\0rpcbind.socket"
using the same name as the systemd unit file..

This patch chooses the second option, which seems least likely to raise
objections.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 5a8e6d46809ae799a4b4d180a45b83f55882e971..5988a5c5ff3f0c430d622336f2eadd3af95de14a 100644 (file)
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -36,6 +36,7 @@
 #include "netns.h"
 
 #define RPCBIND_SOCK_PATHNAME  "/var/run/rpcbind.sock"
+#define RPCBIND_SOCK_ABSTRACT_NAME "\0/run/rpcbind.sock"
 
 #define RPCBIND_PROGRAM                (100000u)
 #define RPCBIND_PORT           (111u)
@@ -216,21 +217,22 @@ static void rpcb_set_local(struct net *net, struct rpc_clnt *clnt,
        sn->rpcb_users = 1;
 }
 
+/* Evaluate to actual length of the `sockaddr_un' structure.  */
+# define SUN_LEN(ptr) (offsetof(struct sockaddr_un, sun_path)          \
+                     + 1 + strlen((ptr)->sun_path + 1))
+
 /*
  * Returns zero on success, otherwise a negative errno value
  * is returned.
  */
-static int rpcb_create_local_unix(struct net *net)
+static int rpcb_create_af_local(struct net *net,
+                               const struct sockaddr_un *addr)
 {
-       static const struct sockaddr_un rpcb_localaddr_rpcbind = {
-               .sun_family             = AF_LOCAL,
-               .sun_path               = RPCBIND_SOCK_PATHNAME,
-       };
        struct rpc_create_args args = {
                .net            = net,
                .protocol       = XPRT_TRANSPORT_LOCAL,
-               .address        = (struct sockaddr *)&rpcb_localaddr_rpcbind,
-               .addrsize       = sizeof(rpcb_localaddr_rpcbind),
+               .address        = (struct sockaddr *)addr,
+               .addrsize       = SUN_LEN(addr),
                .servername     = "localhost",
                .program        = &rpcb_program,
                .version        = RPCBVERS_2,
@@ -269,6 +271,26 @@ out:
        return result;
 }
 
+static int rpcb_create_local_abstract(struct net *net)
+{
+       static const struct sockaddr_un rpcb_localaddr_abstract = {
+               .sun_family             = AF_LOCAL,
+               .sun_path               = RPCBIND_SOCK_ABSTRACT_NAME,
+       };
+
+       return rpcb_create_af_local(net, &rpcb_localaddr_abstract);
+}
+
+static int rpcb_create_local_unix(struct net *net)
+{
+       static const struct sockaddr_un rpcb_localaddr_unix = {
+               .sun_family             = AF_LOCAL,
+               .sun_path               = RPCBIND_SOCK_PATHNAME,
+       };
+
+       return rpcb_create_af_local(net, &rpcb_localaddr_unix);
+}
+
 /*
  * Returns zero on success, otherwise a negative errno value
  * is returned.
@@ -332,7 +354,8 @@ int rpcb_create_local(struct net *net)
        if (rpcb_get_local(net))
                goto out;
 
-       if (rpcb_create_local_unix(net) != 0)
+       if (rpcb_create_local_abstract(net) != 0 &&
+           rpcb_create_local_unix(net) != 0)
                result = rpcb_create_local_net(net);
 
 out: