Skip to contentSkip to conversation

nfs-utils: add and use nfs_authsys_create

PATCH In review Jeff Layton 2 participants 6 messages Feb 19, 2010 – Mar 8, 2010 2 messages not in the archive

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

PATCH 1/1 nfs-utils: add and use nfs_authsys_create

The current mount, umount and showmount code uses authunix_create_default to get an auth handle. The one provided by glibc returned a truncated list of groups when there were more than 16 groups. libtirpc however currently does an abort() in this case, which causes the program to crash and dump core.

nfs-utils just uses these auth handles for the MNT protocol, so the group list doesn't make a lot of difference here. Add a new function that creates an auth handle with a supplemental gids list that consists only of the primary gid. Have nfs-utils use that function anywhere that it currently uses authunix_create_default. Also, have the caller properly check for a NULL return from that function.

---
 support/include/nfsrpc.h    |    3 +++
 support/nfs/rpc_socket.c    |   21 +++++++++++++++++++++
 utils/mount/network.c       |   15 ++++++++++++---
 utils/showmount/showmount.c |    8 +++++++-
 4 files changed, 43 insertions(+), 4 deletions(-)
support/include/nfsrpc.h +3 -0
index 4db35ab..6ebefca 100644
@@ -160,4 +160,7 @@ extern int		nfs_rpc_ping(const struct sockaddr *sap,
 				const unsigned short protocol,
 				const struct timeval *timeout);
 
+/* create AUTH_SYS handle with no supplemental groups */
+extern AUTH *			 nfs_authsys_create(void);
+
 #endif	/* !__NFS_UTILS_NFSRPC_H */
support/nfs/rpc_socket.c +21 -0
index 0e20824..aa6a205 100644
@@ -557,3 +557,24 @@ rpcprog_t nfs_getrpcbyname(const rpcprog_t program, const char *table[])
 
 	return program;
 }
+
+/*
+ * AUTH_SYS doesn't allow more than 16 gids in the supplemental group list.
+ * If there are more than that, trying to determine which ones to include
+ * in the list is problematic. This function creates an auth handle that
+ * only has the primary gid in the supplemental gids list. It's intended to
+ * be used for protocols where credentials really don't matter much (the MNT
+ * protocol, for instance).
+ */
+AUTH *
+nfs_authsys_create(void)
+{
+	char machname[MAXHOSTNAMELEN + 1];
+	uid_t	uid = geteuid();
+	gid_t	gid = getegid();
+
+	if (gethostname(machname, sizeof(machname)) == -1)
+		return NULL;
+
+	return authsys_create(machname, uid, gid, 1, &gid);
+}
utils/mount/network.c +12 -3
index 8dc183a..c541257 100644
@@ -857,7 +857,14 @@ int nfs_advise_umount(const struct sockaddr *sap, const socklen_t salen,
 		return 0;
 	}
 
-	client->cl_auth = authunix_create_default();
+	client->cl_auth = nfs_authsys_create();
+	if (client->cl_auth == NULL) {
+		if (verbose)
+			nfs_error(_("%s: Failed to create RPC auth handle"),
+				progname);
+		CLNT_DESTROY(client);
+		return 0;
+	}
 
 	res = CLNT_CALL(client, MOUNTPROC_UMNT,
 			(xdrproc_t)xdr_dirpath, (caddr_t)argp,
@@ -957,8 +964,10 @@ CLIENT *mnt_openclnt(clnt_addr_t *mnt_server, int *msock)
 	}
 	if (clnt) {
 		/* try to mount hostname:dirname */
-		clnt->cl_auth = authunix_create_default();
-		return clnt;
+		clnt->cl_auth = nfs_authsys_create();
+		if (clnt->cl_auth)
+			return clnt;
+		CLNT_DESTROY(clnt);
 	}
 	return NULL;
 }
utils/showmount/showmount.c +7 -1
index f567093..394f528 100644
@@ -194,7 +194,13 @@ int main(int argc, char **argv)
 	}
 
 	mclient = nfs_get_mount_client(hostname, mount_vers_tbl[vers]);
-	mclient->cl_auth = authunix_create_default();
+	mclient->cl_auth = nfs_authsys_create();
+	if (mclient->cl_auth == NULL) {
+		fprintf(stderr, "%s: unable to create RPC auth handle.\n",
+				program_name);
+		clnt_destroy(mclient);
+		exit(1);
+	}
 	total_timeout.tv_sec = TOTAL_TIMEOUT;
 	total_timeout.tv_usec = 0;
 
Signature · 1 line
1.6.6
#1 lore raw
Quoted 6 lines · On Fri, 19 Feb 2010 18:05:28 -0500 Jeff Layton <[email protected]> wrote:

The current mount, umount and showmount code uses authunix_create_default to get an auth handle. The one provided by glibc returned a truncated list of groups when there were more than 16 groups. libtirpc however currently does an abort() in this case, which causes the program to crash and dump core.

Quoted 8 lines

nfs-utils just uses these auth handles for the MNT protocol, so the group list doesn't make a lot of difference here. Add a new function that creates an auth handle with a supplemental gids list that consists only of the primary gid. Have nfs-utils use that function anywhere that it currently uses authunix_create_default. Also, have the caller properly check for a NULL return from that function.

My apologies -- I mistakenly sent out an earlier version of this patch instead of the latest. I just sent the right version of this patch as "try #2".

Signature · 1 line
Jeff Layton <[email protected]>
#2 lore raw
In reply to Jeff Layton
Quoted 13 lines · Jeff Layton

The current mount, umount and showmount code uses authunix_create_default to get an auth handle. The one provided by glibc returned a truncated list of groups when there were more than 16 groups. libtirpc however currently does an abort() in this case, which causes the program to crash and dump core.

nfs-utils just uses these auth handles for the MNT protocol, so the group list doesn't make a lot of difference here. Add a new function that creates an auth handle with a supplemental gids list that consists only of the primary gid. Have nfs-utils use that function anywhere that it currently uses authunix_create_default. Also, have the caller properly check for a NULL return from that function.

Quoted 9 lines
---
 support/include/nfsrpc.h    |    3 +++
 support/nfs/rpc_socket.c    |   21 +++++++++++++++++++++
 utils/mount/network.c       |   15 ++++++++++++---
 utils/showmount/showmount.c |    8 +++++++-
 4 files changed, 43 insertions(+), 4 deletions(-)

Committed...

steved.

#3 lore raw
In reply to Jeff Layton
Quoted 52 lines · Jeff Layton

The current mount, umount and showmount code uses authunix_create_default to get an auth handle. The one provided by glibc returned a truncated list of groups when there were more than 16 groups. libtirpc however currently does an abort() in this case, which causes the program to crash and dump core.

nfs-utils just uses these auth handles for the MNT protocol, so the group list doesn't make a lot of difference here. Add a new function that creates an auth handle with a supplemental gids list that consists only of the primary gid. Have nfs-utils use that function anywhere that it currently uses authunix_create_default. Also, have the caller properly check for a NULL return from that function.

---
 support/include/nfsrpc.h    |    3 +++
 support/nfs/rpc_socket.c    |   21 +++++++++++++++++++++
 utils/mount/network.c       |   15 ++++++++++++---
 utils/showmount/showmount.c |    8 +++++++-
 4 files changed, 43 insertions(+), 4 deletions(-)
support/include/nfsrpc.h +3 -0
index 4db35ab..6ebefca 100644
@@ -160,4 +160,7 @@ extern int		nfs_rpc_ping(const struct sockaddr *sap,
 				const unsigned short protocol,
 				const struct timeval *timeout);
 
+/* create AUTH_SYS handle with no supplemental groups */
+extern AUTH *			 nfs_authsys_create(void);
+
 #endif	/* !__NFS_UTILS_NFSRPC_H */
support/nfs/rpc_socket.c +11 -0
index 0e20824..aa6a205 100644
@@ -557,3 +557,24 @@ rpcprog_t nfs_getrpcbyname(const rpcprog_t program, const char *table[])
 
 	return program;
 }
+
+/*
+ * AUTH_SYS doesn't allow more than 16 gids in the supplemental group list.
+ * If there are more than that, trying to determine which ones to include
+ * in the list is problematic. This function creates an auth handle that
+ * only has the primary gid in the supplemental gids list. It's intended to
+ * be used for protocols where credentials really don't matter much (the MNT
+ * protocol, for instance).
+ */
+AUTH *
+nfs_authsys_create(void)

support/nfs/rpc_socket.c rpcprog_t nfs_getrpcbyname(const rpcprog_t program, const char *table[]) · line 580

Quoted 10 lines
support/nfs/rpc_socket.c +10 -0
+{
+	char machname[MAXHOSTNAMELEN + 1];
+	uid_t	uid = geteuid();
+	gid_t	gid = getegid();
+
+	if (gethostname(machname, sizeof(machname)) == -1)
+		return NULL;
+
+	return authsys_create(machname, uid, gid, 1, &gid);
+}

The following patch is needed to fix regression when tirpc is disabled:

steved.

Author: Steve Dickson <[email protected]>
Date:   Mon Mar 8 10:24:44 2010 -0500

Use authunix_create() instead of authsys_create() to fix regression.

Commit 409b8 introduced a regression when the --disable-tirpc configuration flag is set. The authsys_create() interface, which was introduced, does not exist in the legacy glibc library.

Since the authsys_create() interface is a redefined of the authunix_create() interface, which is defined in glibc, using authunix_create() resolves the regression,

support/nfs/rpc_socket.c +1 -1
index aa6a205..c14efe8 100644
@@ -576,5 +576,5 @@ nfs_authsys_create(void)
        if (gethostname(machname, sizeof(machname)) == -1)
                return NULL;
 
-       return authsys_create(machname, uid, gid, 1, &gid);
+       return authunix_create(machname, uid, gid, 1, &gid);
 }

A message that is not in the archive (sent off-list or not yet received): [email protected]

author Acked-by
#5 lore raw
Quoted 91 lines · On Mon, 08 Mar 2010 10:36:36 -0500 Steve Dickson <[email protected]> wrote:
Quoted 52 lines · Jeff Layton

The current mount, umount and showmount code uses authunix_create_default to get an auth handle. The one provided by glibc returned a truncated list of groups when there were more than 16 groups. libtirpc however currently does an abort() in this case, which causes the program to crash and dump core.

nfs-utils just uses these auth handles for the MNT protocol, so the group list doesn't make a lot of difference here. Add a new function that creates an auth handle with a supplemental gids list that consists only of the primary gid. Have nfs-utils use that function anywhere that it currently uses authunix_create_default. Also, have the caller properly check for a NULL return from that function.

---
 support/include/nfsrpc.h    |    3 +++
 support/nfs/rpc_socket.c    |   21 +++++++++++++++++++++
 utils/mount/network.c       |   15 ++++++++++++---
 utils/showmount/showmount.c |    8 +++++++-
 4 files changed, 43 insertions(+), 4 deletions(-)
support/include/nfsrpc.h +3 -0
index 4db35ab..6ebefca 100644
@@ -160,4 +160,7 @@ extern int		nfs_rpc_ping(const struct sockaddr *sap,
 				const unsigned short protocol,
 				const struct timeval *timeout);
 
+/* create AUTH_SYS handle with no supplemental groups */
+extern AUTH *			 nfs_authsys_create(void);
+
 #endif	/* !__NFS_UTILS_NFSRPC_H */
support/nfs/rpc_socket.c +11 -0
index 0e20824..aa6a205 100644
@@ -557,3 +557,24 @@ rpcprog_t nfs_getrpcbyname(const rpcprog_t program, const char *table[])
 
 	return program;
 }
+
+/*
+ * AUTH_SYS doesn't allow more than 16 gids in the supplemental group list.
+ * If there are more than that, trying to determine which ones to include
+ * in the list is problematic. This function creates an auth handle that
+ * only has the primary gid in the supplemental gids list. It's intended to
+ * be used for protocols where credentials really don't matter much (the MNT
+ * protocol, for instance).
+ */
+AUTH *
+nfs_authsys_create(void)

support/nfs/rpc_socket.c rpcprog_t nfs_getrpcbyname(const rpcprog_t program, const char *table[]) · line 580

Quoted 10 lines
support/nfs/rpc_socket.c +10 -0
+{
+	char machname[MAXHOSTNAMELEN + 1];
+	uid_t	uid = geteuid();
+	gid_t	gid = getegid();
+
+	if (gethostname(machname, sizeof(machname)) == -1)
+		return NULL;
+
+	return authsys_create(machname, uid, gid, 1, &gid);
+}

The following patch is needed to fix regression when tirpc is disabled:

steved.

Author: Steve Dickson <[email protected]>
Date:   Mon Mar 8 10:24:44 2010 -0500

Use authunix_create() instead of authsys_create() to fix regression.

Commit 409b8 introduced a regression when the --disable-tirpc configuration flag is set. The authsys_create() interface, which was introduced, does not exist in the legacy glibc library.

Since the authsys_create() interface is a redefined of the authunix_create() interface, which is defined in glibc, using authunix_create() resolves the regression,

support/nfs/rpc_socket.c +0 -0
index aa6a205..c14efe8 100644

support/nfs/rpc_socket.c nfs_authsys_create(void) · line 580

Quoted 6 lines
support/nfs/rpc_socket.c +1 -1
@@ -576,5 +576,5 @@ nfs_authsys_create(void)
        if (gethostname(machname, sizeof(machname)) == -1)
                return NULL;
 
-       return authsys_create(machname, uid, gid, 1, &gid);
+       return authunix_create(machname, uid, gid, 1, &gid);
 }

A message that is not in the archive (sent off-list or not yet received): 20100308104032.53593709-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org

#7 lore raw
Quoted 96 lines · Jeff Layton
Quoted 93 lines · On Mon, 08 Mar 2010 10:36:36 -0500 Steve Dickson <[email protected]> wrote:
Quoted 52 lines · Jeff Layton

The current mount, umount and showmount code uses authunix_create_default to get an auth handle. The one provided by glibc returned a truncated list of groups when there were more than 16 groups. libtirpc however currently does an abort() in this case, which causes the program to crash and dump core.

nfs-utils just uses these auth handles for the MNT protocol, so the group list doesn't make a lot of difference here. Add a new function that creates an auth handle with a supplemental gids list that consists only of the primary gid. Have nfs-utils use that function anywhere that it currently uses authunix_create_default. Also, have the caller properly check for a NULL return from that function.

---
 support/include/nfsrpc.h    |    3 +++
 support/nfs/rpc_socket.c    |   21 +++++++++++++++++++++
 utils/mount/network.c       |   15 ++++++++++++---
 utils/showmount/showmount.c |    8 +++++++-
 4 files changed, 43 insertions(+), 4 deletions(-)
support/include/nfsrpc.h +3 -0
index 4db35ab..6ebefca 100644
@@ -160,4 +160,7 @@ extern int		nfs_rpc_ping(const struct sockaddr *sap,
 				const unsigned short protocol,
 				const struct timeval *timeout);
 
+/* create AUTH_SYS handle with no supplemental groups */
+extern AUTH *			 nfs_authsys_create(void);
+
 #endif	/* !__NFS_UTILS_NFSRPC_H */
support/nfs/rpc_socket.c +11 -0
index 0e20824..aa6a205 100644
@@ -557,3 +557,24 @@ rpcprog_t nfs_getrpcbyname(const rpcprog_t program, const char *table[])
 
 	return program;
 }
+
+/*
+ * AUTH_SYS doesn't allow more than 16 gids in the supplemental group list.
+ * If there are more than that, trying to determine which ones to include
+ * in the list is problematic. This function creates an auth handle that
+ * only has the primary gid in the supplemental gids list. It's intended to
+ * be used for protocols where credentials really don't matter much (the MNT
+ * protocol, for instance).
+ */
+AUTH *
+nfs_authsys_create(void)

support/nfs/rpc_socket.c rpcprog_t nfs_getrpcbyname(const rpcprog_t program, const char *table[]) · line 580

Quoted 10 lines
support/nfs/rpc_socket.c +10 -0
+{
+	char machname[MAXHOSTNAMELEN + 1];
+	uid_t	uid = geteuid();
+	gid_t	gid = getegid();
+
+	if (gethostname(machname, sizeof(machname)) == -1)
+		return NULL;
+
+	return authsys_create(machname, uid, gid, 1, &gid);
+}

The following patch is needed to fix regression when tirpc is disabled:

steved.

Author: Steve Dickson <[email protected]>
Date:   Mon Mar 8 10:24:44 2010 -0500

Use authunix_create() instead of authsys_create() to fix regression.

Commit 409b8 introduced a regression when the --disable-tirpc configuration flag is set. The authsys_create() interface, which was introduced, does not exist in the legacy glibc library.

Since the authsys_create() interface is a redefined of the authunix_create() interface, which is defined in glibc, using authunix_create() resolves the regression,

support/nfs/rpc_socket.c +0 -0
index aa6a205..c14efe8 100644
@@ -576,5 +576,5 @@ nfs_authsys_create(void)
        if (gethostname(machname, sizeof(machname)) == -1)
                return NULL;
 
Quoted 6 lines

support/nfs/rpc_socket.c nfs_authsys_create(void) · line 580

Quoted 4 lines
support/nfs/rpc_socket.c +1 -1
-       return authsys_create(machname, uid, gid, 1, &gid);
+       return authunix_create(machname, uid, gid, 1, &gid);
 }

Committed....

steved.