Skip to contentSkip to conversation

mount.nfs: return error if proto= option specified IPv6 when IPv6 isn't supported (try #2)

PATCH In review Jeff Layton 3 participants 6 messages Feb 9, 2010 – Feb 12, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mount.nfs: return error if proto= option specified IPv6 when IPv6 isn't supported (try #2)

Right now, there's nothing that expressly forbids someone from specifying proto=tcp6 for instance, even when nfs-utils it built without IPv6 support. This may not work well if (for instance) they are using NFSv3, since statd won't support IPv6. Explicitly return an error if someone specifies an IPv6 proto= or mountproto= option and IPv6 isn't supported.

---
 utils/mount/network.c |   59 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 43 insertions(+), 16 deletions(-)
utils/mount/network.c +43 -16
index c400dd8..a12fbe2 100644
@@ -1334,21 +1334,36 @@ nfs_nfs_port(struct mount_options *options, unsigned long *port)
 
 #ifdef IPV6_SUPPORTED
 sa_family_t	config_default_family = AF_UNSPEC;
-#else
+
+static int
+nfs_verify_family(sa_family_t family)
+{
+	return 1;
+}
+#else /* IPV6_SUPPORTED */
 sa_family_t	config_default_family = AF_INET;
-#endif
+
+static int
+nfs_verify_family(sa_family_t family)
+{
+	if (family != AF_INET)
+		return 0;
+
+	return 1;
+}
+#endif /* IPV6_SUPPORTED */
 
 /*
  * Returns TRUE and fills in @family if a valid NFS protocol option
- * is found, or FALSE if the option was specified with an invalid value.
+ * is found, or FALSE if the option was specified with an invalid value
+ * or if the protocol family isn't supported. On error, errno is set.
  */
 int nfs_nfs_proto_family(struct mount_options *options,
 				sa_family_t *family)
 {
 	unsigned long protocol;
 	char *option;
-
-	*family = config_default_family;
+	sa_family_t tmp_family = config_default_family;
 
 	switch (po_rightmost(options, nfs_transport_opttbl)) {
 	case 0:	/* udp */
@@ -1357,15 +1372,18 @@ int nfs_nfs_proto_family(struct mount_options *options,
 		return 1;
 	case 2: /* proto */
 		option = po_get(options, "proto");
-		if (option != NULL)
-			return nfs_get_proto(option, family, &protocol);
+		if (option != NULL &&
+		    !nfs_get_proto(option, &tmp_family, &protocol))
+			goto out_err;
 	}
 
-	/*
-	 * NFS transport protocol wasn't specified.  Return the
-	 * default address family.
-	 */
+	if (!nfs_verify_family(tmp_family))
+		goto out_err;
+	*family = tmp_family;
 	return 1;
+out_err:
+	errno = EAFNOSUPPORT;
+	return 0;
 }
 
 /*
@@ -1483,19 +1501,25 @@ nfs_mount_port(struct mount_options *options, unsigned long *port)
 
 /*
  * Returns TRUE and fills in @family if a valid MNT protocol option
- * is found, or FALSE if the option was specified with an invalid value.
+ * is found, or FALSE if the option was specified with an invalid value
+ * or if the protocol family isn't supported. On error, errno is set.
  */
 int nfs_mount_proto_family(struct mount_options *options,
 				sa_family_t *family)
 {
 	unsigned long protocol;
 	char *option;
-
-	*family = config_default_family;
+	sa_family_t tmp_family = config_default_family;
 
 	option = po_get(options, "mountproto");
-	if (option != NULL)
-		return nfs_get_proto(option, family, &protocol);
+	if (option != NULL) {
+		if (!nfs_get_proto(option, &tmp_family, &protocol))
+			goto out_err;
+		if (!nfs_verify_family(tmp_family))
+			goto out_err;
+		*family = tmp_family;
+		return 1;
+	}
 
 	/*
 	 * MNT transport protocol wasn't specified.  If the NFS
@@ -1504,6 +1528,9 @@ int nfs_mount_proto_family(struct mount_options *options,
 	 * NFS.
 	 */
 	return nfs_nfs_proto_family(options, family);
+out_err:
+	errno = EAFNOSUPPORT;
+	return 0;
 }
 
 /**
Signature · 1 line
1.6.6
#1 lore raw

PATCH 1/1 mount.nfs: make nfs_{nfs,mount}_proto set errno on error

Have nfs_nfs_proto and nfs_mount_proto set errno to EPROTONOSUPPORT on error. This helps default_value to display sane warning messages.

---
 utils/mount/network.c |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)
utils/mount/network.c +18 -6
index a12fbe2..f020933 100644
@@ -1273,7 +1273,8 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
 
 /*
  * Returns TRUE if @protocol contains a valid value for this option,
- * or FALSE if the option was specified with an invalid value.
+ * or FALSE if the option was specified with an invalid value. On
+ * error, errno is set.
  */
 int
 nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
@@ -1290,8 +1291,13 @@ nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
 		return 1;
 	case 2: /* proto */
 		option = po_get(options, "proto");
-		if (option != NULL)
-			return nfs_get_proto(option, &family, protocol);
+		if (option != NULL) {
+			if (!nfs_get_proto(option, &family, protocol)) {
+				errno = EPROTONOSUPPORT;
+				return 0;
+			}
+			return 1;
+		}
 	}
 
 	/*
@@ -1449,7 +1455,8 @@ nfs_mount_version(struct mount_options *options, unsigned long *version)
 
 /*
  * Returns TRUE if @protocol contains a valid value for this option,
- * or FALSE if the option was specified with an invalid value.
+ * or FALSE if the option was specified with an invalid value. On
+ * error, errno is set.
  */
 static int
 nfs_mount_protocol(struct mount_options *options, unsigned long *protocol)
@@ -1458,8 +1465,13 @@ nfs_mount_protocol(struct mount_options *options, unsigned long *protocol)
 	char *option;
 
 	option = po_get(options, "mountproto");
-	if (option != NULL)
-		return nfs_get_proto(option, &family, protocol);
+	if (option != NULL) {
+		if (!nfs_get_proto(option, &family, protocol)) {
+			errno = EPROTONOSUPPORT;
+			return 0;
+		}
+		return 1;
+	}
 
 	/*
 	 * MNT transport protocol wasn't specified.  If the NFS
Signature · 1 line
1.6.6
Reviewed-by on v1 1/1
#2 lore raw

Re: [PATCH] mount.nfs: make nfs_{nfs,mount}_proto set errno on error

Quoted 64 lines · Jeff Layton

Have nfs_nfs_proto and nfs_mount_proto set errno to EPROTONOSUPPORT on error. This helps default_value to display sane warning messages.

---
  utils/mount/network.c |   24 ++++++++++++++++++------
  1 files changed, 18 insertions(+), 6 deletions(-)
utils/mount/network.c +18 -6
index a12fbe2..f020933 100644
@@ -1273,7 +1273,8 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
 
  /*
   * Returns TRUE if @protocol contains a valid value for this option,
- * or FALSE if the option was specified with an invalid value.
+ * or FALSE if the option was specified with an invalid value. On
+ * error, errno is set.
   */
  int
  nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
@@ -1290,8 +1291,13 @@ nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
  		return 1;
  	case 2: /* proto */
  		option = po_get(options, "proto");
-		if (option != NULL)
-			return nfs_get_proto(option,&family, protocol);
+		if (option != NULL) {
+			if (!nfs_get_proto(option,&family, protocol)) {
+				errno = EPROTONOSUPPORT;
+				return 0;
+			}
+			return 1;
+		}
  	}
 
  	/*
@@ -1449,7 +1455,8 @@ nfs_mount_version(struct mount_options *options, unsigned long *version)
 
  /*
   * Returns TRUE if @protocol contains a valid value for this option,
- * or FALSE if the option was specified with an invalid value.
+ * or FALSE if the option was specified with an invalid value. On
+ * error, errno is set.
   */
  static int
  nfs_mount_protocol(struct mount_options *options, unsigned long *protocol)
@@ -1458,8 +1465,13 @@ nfs_mount_protocol(struct mount_options *options, unsigned long *protocol)
  	char *option;
 
  	option = po_get(options, "mountproto");
-	if (option != NULL)
-		return nfs_get_proto(option,&family, protocol);
+	if (option != NULL) {
+		if (!nfs_get_proto(option,&family, protocol)) {
+			errno = EPROTONOSUPPORT;
+			return 0;
+		}
+		return 1;
+	}
 
  	/*
  	 * MNT transport protocol wasn't specified.  If the NFS
Signature · 1 line
chuck[dot]lever[at]oracle[dot]com
Reviewed-by on v1 1/1
#4 lore raw
In reply to Jeff Layton
Quoted 124 lines · Jeff Layton

Right now, there's nothing that expressly forbids someone from specifying proto=tcp6 for instance, even when nfs-utils it built without IPv6 support. This may not work well if (for instance) they are using NFSv3, since statd won't support IPv6. Explicitly return an error if someone specifies an IPv6 proto= or mountproto= option and IPv6 isn't supported.

---
  utils/mount/network.c |   59 +++++++++++++++++++++++++++++++++++-------------
  1 files changed, 43 insertions(+), 16 deletions(-)
utils/mount/network.c +43 -16
index c400dd8..a12fbe2 100644
@@ -1334,21 +1334,36 @@ nfs_nfs_port(struct mount_options *options, unsigned long *port)
 
  #ifdef IPV6_SUPPORTED
  sa_family_t	config_default_family = AF_UNSPEC;
-#else
+
+static int
+nfs_verify_family(sa_family_t family)
+{
+	return 1;
+}
+#else /* IPV6_SUPPORTED */
  sa_family_t	config_default_family = AF_INET;
-#endif
+
+static int
+nfs_verify_family(sa_family_t family)
+{
+	if (family != AF_INET)
+		return 0;
+
+	return 1;
+}
+#endif /* IPV6_SUPPORTED */
 
  /*
   * Returns TRUE and fills in @family if a valid NFS protocol option
- * is found, or FALSE if the option was specified with an invalid value.
+ * is found, or FALSE if the option was specified with an invalid value
+ * or if the protocol family isn't supported. On error, errno is set.
   */
  int nfs_nfs_proto_family(struct mount_options *options,
  				sa_family_t *family)
  {
  	unsigned long protocol;
  	char *option;
-
-	*family = config_default_family;
+	sa_family_t tmp_family = config_default_family;
 
  	switch (po_rightmost(options, nfs_transport_opttbl)) {
  	case 0:	/* udp */
@@ -1357,15 +1372,18 @@ int nfs_nfs_proto_family(struct mount_options *options,
  		return 1;
  	case 2: /* proto */
  		option = po_get(options, "proto");
-		if (option != NULL)
-			return nfs_get_proto(option, family,&protocol);
+		if (option != NULL&&
+		    !nfs_get_proto(option,&tmp_family,&protocol))
+			goto out_err;
  	}
 
-	/*
-	 * NFS transport protocol wasn't specified.  Return the
-	 * default address family.
-	 */
+	if (!nfs_verify_family(tmp_family))
+		goto out_err;
+	*family = tmp_family;
  	return 1;
+out_err:
+	errno = EAFNOSUPPORT;
+	return 0;
  }
 
  /*
@@ -1483,19 +1501,25 @@ nfs_mount_port(struct mount_options *options, unsigned long *port)
 
  /*
   * Returns TRUE and fills in @family if a valid MNT protocol option
- * is found, or FALSE if the option was specified with an invalid value.
+ * is found, or FALSE if the option was specified with an invalid value
+ * or if the protocol family isn't supported. On error, errno is set.
   */
  int nfs_mount_proto_family(struct mount_options *options,
  				sa_family_t *family)
  {
  	unsigned long protocol;
  	char *option;
-
-	*family = config_default_family;
+	sa_family_t tmp_family = config_default_family;
 
  	option = po_get(options, "mountproto");
-	if (option != NULL)
-		return nfs_get_proto(option, family,&protocol);
+	if (option != NULL) {
+		if (!nfs_get_proto(option,&tmp_family,&protocol))
+			goto out_err;
+		if (!nfs_verify_family(tmp_family))
+			goto out_err;
+		*family = tmp_family;
+		return 1;
+	}
 
  	/*
  	 * MNT transport protocol wasn't specified.  If the NFS
@@ -1504,6 +1528,9 @@ int nfs_mount_proto_family(struct mount_options *options,
  	 * NFS.
  	 */
  	return nfs_nfs_proto_family(options, family);
+out_err:
+	errno = EAFNOSUPPORT;
+	return 0;
  }
 
  /**
Signature · 1 line
chuck[dot]lever[at]oracle[dot]com
#5 lore raw
In reply to Jeff Layton
Quoted 8 lines · Jeff Layton

Right now, there's nothing that expressly forbids someone from specifying proto=tcp6 for instance, even when nfs-utils it built without IPv6 support. This may not work well if (for instance) they are using NFSv3, since statd won't support IPv6. Explicitly return an error if someone specifies an IPv6 proto= or mountproto= option and IPv6 isn't supported.

Committed...

steved.