mountd: Junctions inherit parent export's options

Attempting to access junctions on a Linux NFS server from an NFS
client connected via an ephemeral source port fails with a "client
insecure" error on the server.  This happens even when the
"insecure" export option is specified on the junction's parent
export.

As a test, via a mountd code change, I added "insecure" to the fixed
export options that mountd sets up for each junction, and the error
disappeared.

It's simple enough for old-school referrals configured directly in
/etc/exports ("refer=") to have the needed options specified there.
Cache entries for junctions, however, are created on the fly by
mountd, and don't ever appear in /etc/exports.  So there's nowhere
obvious that export options for junctions can be specified.

Bruce suggested that in order to specify unique export options for
junctions, they should inherit the export options of their parent
export.  The junction's parent's exportent is duplicated in order
to create an exportent for the junction itself.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index b858e6001ccceb2f9dbf8b4eb1aefb7375802158..9c2b97280e4212b6d46b59d3a4776807f03ce149 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -965,6 +965,39 @@ out_false:
        return false;
 }
 
        return false;
 }
 

+/*
+ * Duplicate the junction's parent's export options and graft in
+ * the fslocdata we constructed from the locations list.
+ *
+ * Returned exportent points to static memory.
+ */
+static struct exportent *create_junction_exportent(struct exportent *parent,
+               const char *junction, const char *fslocdata, int ttl)
+{
+       static struct exportent ee;
+
+       dupexportent(&ee, parent);
+       strcpy(ee.e_path, junction);
+       ee.e_hostname = strdup(parent->e_hostname);
+       if (ee.e_hostname == NULL)
+               goto out_nomem;
+       free(ee.e_uuid);
+       ee.e_uuid = NULL;
+       ee.e_ttl = (unsigned int)ttl;
+
+       free(ee.e_fslocdata);
+       ee.e_fslocmethod = FSLOC_REFER;
+       ee.e_fslocdata = strdup(fslocdata);
+       if (ee.e_fslocdata == NULL)
+               goto out_nomem;
+
+       return ⅇ
+
+out_nomem:
+       xlog(L_ERROR, "%s: No memory", __func__);
+       return NULL;
+}
+

 /*
  * Walk through the set of FS locations and build an exportent.
  * Returns pointer to an exportent if "junction" refers to a junction.
 /*
  * Walk through the set of FS locations and build an exportent.
  * Returns pointer to an exportent if "junction" refers to a junction.


@@ -973,34 +1006,16 @@ out_false:
  */
 static struct exportent *locations_to_export(struct jp_ops *ops,
                nfs_fsloc_set_t locations, const char *junction,
  */
 static struct exportent *locations_to_export(struct jp_ops *ops,
                nfs_fsloc_set_t locations, const char *junction,

-               struct exportent *UNUSED(parent))
+               struct exportent *parent)

 {
        static char fslocdata[BUFSIZ];
 {
        static char fslocdata[BUFSIZ];

-       struct exportent *exp;

        int ttl;
 
        fslocdata[0] = '\0';
        if (!locations_to_fslocdata(ops, locations,
                                        fslocdata, sizeof(fslocdata), &ttl))
                return NULL;
        int ttl;
 
        fslocdata[0] = '\0';
        if (!locations_to_fslocdata(ops, locations,
                                        fslocdata, sizeof(fslocdata), &ttl))
                return NULL;

-
-       exp = mkexportent("*", (char *)junction, "");
-       if (exp == NULL) {
-               xlog(L_ERROR, "%s: Failed to construct exportent", __func__);
-               return NULL;
-       }
-
-       exp->e_uuid = NULL;
-       exp->e_ttl = ttl;
-
-       free(exp->e_fslocdata);
-       exp->e_fslocmethod = FSLOC_REFER;
-       exp->e_fslocdata = strdup(fslocdata);
-       if (exp->e_fslocdata == NULL) {
-               xlog(L_ERROR, "%s: No memory", __func__);
-               return NULL;
-       }
-       return exp;
+       return create_junction_exportent(parent, junction, fslocdata, ttl);

 }
 
 /*
 }
 
 /*