commit 3e70bc230962b3539d742ea1b886c5d63b303cd6

Author: Tomas Halman <thalman@redhat.com>

Date:   Fri Sep 23 14:08:21 2022 +0200

    Correct popt memory handling

    In the code of libusers we use popt library but we release popt context

    too early. In older versions, popt leaked memory, so it worked anyway.

    With this patch poptFeeContext() call is moved to the end of main()

    function.

    The patch also unifies the way utilities terminate in case of an error.

    Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2125904

diff --git a/apps/lchage.c b/apps/lchage.c

index 1a4f048..3620e75 100644

--- a/apps/lchage.c

+++ b/apps/lchage.c

@@ -71,13 +71,14 @@ main(int argc, const char **argv)

 	long shadowMin = INVALID_LONG, shadowMax = INVALID_LONG,

 	     shadowLastChange = INVALID_LONG, shadowInactive = INVALID_LONG,

 	     shadowExpire = INVALID_LONG, shadowWarning = INVALID_LONG;

-	const char *user;

-	struct lu_context *ctx;

-	struct lu_ent *ent;

+	const char *user = NULL;

+	struct lu_context *ctx = NULL;

+	struct lu_ent *ent = NULL;

 	struct lu_error *error = NULL;

 	int interactive = FALSE;

 	int list_only = FALSE;

 	int c;

+	int result;

 	poptContext popt;

 	struct poptOption options[] = {

@@ -118,7 +119,8 @@ main(int argc, const char **argv)

 		fprintf(stderr, _("Error parsing arguments: %s.\n"),

 			poptStrerror(c));

 		poptPrintUsage(popt, stderr, 0);

-		exit(1);

+		result = 1;

+		goto done;

 	}

 	user = poptGetArg(popt);

@@ -126,11 +128,10 @@ main(int argc, const char **argv)

 	if (user == NULL) {

 		fprintf(stderr, _("No user name specified.\n"));

 		poptPrintUsage(popt, stderr, 0);

-		return 1;

+		result = 1;

+		goto done;

 	}

-	poptFreeContext(popt);

-

 	/* Start up the library. */

 	ctx = lu_start(user, lu_user, NULL, NULL,

 		       interactive ? lu_prompt_console :

@@ -138,7 +139,8 @@ main(int argc, const char **argv)

 	if (ctx == NULL) {

 		fprintf(stderr, _("Error initializing %s: %s.\n"), PACKAGE,

 			lu_strerror(error));

-		return 1;

+		result = 1;

+		goto done;

 	}

 	ent = lu_ent_new();

@@ -146,7 +148,8 @@ main(int argc, const char **argv)

 	/* Look up information about the user. */

 	if (lu_user_lookup_name(ctx, user, ent, &error) == FALSE) {

 		fprintf(stderr, _("User %s does not exist.\n"), user);

-		return 2;

+		result = 2;

+		goto done;

 	}

 	if (list_only) {

@@ -242,7 +245,8 @@ main(int argc, const char **argv)

 				  "%s\n"), user, lu_strerror(error));

 			lu_audit_logger(AUDIT_USER_MGMT, "change-age", user,

 				AUDIT_NO_ID, 0);

-			return 3;

+			result = 3;

+			goto done;

 		}

 		lu_audit_logger(AUDIT_USER_MGMT, "change-age", user,

 				AUDIT_NO_ID, 1);

@@ -250,9 +254,14 @@ main(int argc, const char **argv)

 		lu_nscd_flush_cache(LU_NSCD_CACHE_PASSWD);

 	}

-	lu_ent_free(ent);

+	result = 0;

+

+ done:

+	if (ent) lu_ent_free(ent);

-	lu_end(ctx);

+	if (ctx) lu_end(ctx);

+

+	poptFreeContext(popt);

-	return 0;

+	return result;

 }

diff --git a/apps/lchfn.c b/apps/lchfn.c

index 137f85f..dcc616f 100644

--- a/apps/lchfn.c

+++ b/apps/lchfn.c

@@ -41,11 +41,12 @@ main(int argc, const char **argv)

 {

 	const char *user, *gecos;

 	const char *name, *office, *officephone, *homephone;

-	struct lu_context *ctx;

+	struct lu_context *ctx = NULL;

 	struct lu_error *error = NULL;

-	struct lu_ent *ent;

+	struct lu_ent *ent = NULL;

 	int interactive = FALSE;

 	int c;

+	int result;

 	struct lu_prompt prompts[7];

 	poptContext popt;

 	struct poptOption options[] = {

@@ -53,7 +54,8 @@ main(int argc, const char **argv)

 		 N_("prompt for all information"), NULL},

 		POPT_AUTOHELP POPT_TABLEEND

 	};

-	char **fields, *p;

+	char **fields = NULL;

+	char *p;

 	size_t fields_len;

 	size_t pcount, i;

@@ -70,7 +72,8 @@ main(int argc, const char **argv)

 		fprintf(stderr, _("Error parsing arguments: %s.\n"),

 			poptStrerror(c));

 		poptPrintUsage(popt, stderr, 0);

-		exit(1);

+		result = 1;

+		goto done;

 	}

 	user = poptGetArg(popt);

@@ -86,11 +89,11 @@ main(int argc, const char **argv)

 			fprintf(stderr, _("No user name specified, no name "

 				"for uid %d.\n"), getuid());

 			poptPrintUsage(popt, stderr, 0);

-			exit(1);

+			result = 1;

+			goto done;

 		}

 	}

-	poptFreeContext(popt);

 	/* Give the user some idea of what's going on. */

 	g_print(_("Changing finger information for %s.\n"), user);

@@ -102,7 +105,8 @@ main(int argc, const char **argv)

 	if (ctx == NULL) {

 		fprintf(stderr, _("Error initializing %s: %s.\n"), PACKAGE,

 			lu_strerror(error));

-		return 1;

+		result = 1;

+		goto done;

 	}

 	/* Authenticate the user to the "chfn" service. */

@@ -112,7 +116,8 @@ main(int argc, const char **argv)

 	ent = lu_ent_new();

 	if (lu_user_lookup_name(ctx, user, ent, &error) == FALSE) {

 		fprintf(stderr, _("User %s does not exist.\n"), user);

-		exit(1);

+		result = 1;

+		goto done;

 	}

 	/* Read the user's GECOS information. */

@@ -206,7 +211,8 @@ main(int argc, const char **argv)

 	if (lu_prompt_console(prompts, pcount, NULL, &error) == FALSE) {

 		fprintf(stderr,

 			_("Finger information not changed:  input error.\n"));

-		exit(1);

+		result = 1;

+		goto done;

 	}

 	/* Now iterate over the answers and figure things out. */

@@ -272,14 +278,20 @@ main(int argc, const char **argv)

 	} else {

 		fprintf(stderr, _("Finger information not changed: %s.\n"),

 			lu_strerror(error));

-		return 1;

+		result = 1;

+		goto done;

 	}

+	result = 0;

+

+ done:

 	g_strfreev(fields);

-	lu_ent_free(ent);

+	if (ent) lu_ent_free(ent);

-	lu_end(ctx);

+	if (ctx) lu_end(ctx);

+

+	poptFreeContext(popt);

-	return 0;

+	return result;

 }

diff --git a/apps/lchsh.c b/apps/lchsh.c

index 555ed2e..58b2a34 100644

--- a/apps/lchsh.c

+++ b/apps/lchsh.c

@@ -33,12 +33,13 @@ int

 main(int argc, const char **argv)

 {

 	const char *user;

-	struct lu_context *ctx;

+	struct lu_context *ctx = NULL;

 	struct lu_error *error = NULL;

-	struct lu_ent *ent;

+	struct lu_ent *ent = NULL;

 	char *shell;

 	int interactive = FALSE;

 	int c;

+	int result;

 	poptContext popt;

 	struct poptOption options[] = {

 		{"interactive", 'i', POPT_ARG_NONE, &interactive, 0,

@@ -59,7 +60,8 @@ main(int argc, const char **argv)

 		fprintf(stderr, _("Error parsing arguments: %s.\n"),

 			poptStrerror(c));

 		poptPrintUsage(popt, stderr, 0);

-		exit(1);

+		result = 1;

+		goto done;

 	}

 	user = poptGetArg(popt);

@@ -75,12 +77,11 @@ main(int argc, const char **argv)

 			fprintf(stderr, _("No user name specified, no name for "

 				"uid %d.\n"), getuid());

 			poptPrintUsage(popt, stderr, 0);

-			exit(1);

+			result = 1;

+			goto done;

 		}

 	}

-	poptFreeContext(popt);

-

 	/* Give the user some idea of what's going on. */

 	g_print(_("Changing shell for %s.\n"), user);

@@ -91,7 +92,8 @@ main(int argc, const char **argv)

 	if (ctx == NULL) {

 		fprintf(stderr, _("Error initializing %s: %s.\n"), PACKAGE,

 			lu_strerror(error));

-		return 1;

+		result = 1;

+		goto done;

 	}

 	/* Authenticate the user if we need to. */

@@ -101,7 +103,8 @@ main(int argc, const char **argv)

 	ent = lu_ent_new();

 	if (lu_user_lookup_name(ctx, user, ent, &error) == FALSE) {

 		fprintf(stderr, _("User %s does not exist.\n"), user);

-		exit(1);

+		result = 1;

+		goto done;

 	}

 	/* Read the user's shell. */

@@ -123,7 +126,8 @@ main(int argc, const char **argv)

 				lu_strerror(error));

 			lu_audit_logger(AUDIT_USER_MGMT, "change-shell", user,

 				AUDIT_NO_ID, 0);

-			return 1;

+			result = 1;

+			goto done;

 		}

 		/* Modify the in-memory structure's shell attribute. */

 		lu_ent_set_string(ent, LU_LOGINSHELL, prompts[0].value);

@@ -142,13 +146,19 @@ main(int argc, const char **argv)

 				lu_strerror(error));

 			lu_audit_logger(AUDIT_USER_MGMT, "change-shell", user,

 				AUDIT_NO_ID, 0);

-			return 1;

+			result = 1;

+			goto done;

 		}

 	}

-	lu_ent_free(ent);

+	result = 0;

+

+ done:

+	if (ent) lu_ent_free(ent);

-	lu_end(ctx);

+	if (ctx) lu_end(ctx);

+

+	poptFreeContext(popt);

-	return 0;

+	return result;

 }

diff --git a/apps/lgroupadd.c b/apps/lgroupadd.c

index 3fa2a1d..05bb1a5 100644

--- a/apps/lgroupadd.c

+++ b/apps/lgroupadd.c

@@ -34,12 +34,13 @@ main(int argc, const char **argv)

 {

 	const char *name, *gid_number_str = NULL;

 	gid_t gidNumber = LU_VALUE_INVALID_ID;

-	struct lu_context *ctx;

-	struct lu_ent *ent;

+	struct lu_context *ctx = NULL;

+	struct lu_ent *ent = NULL;

 	struct lu_error *error = NULL;

 	int interactive = FALSE;

 	int system_account = FALSE;

 	int c;

+	int result;

 	poptContext popt;

 	struct poptOption options[] = {

@@ -65,7 +66,8 @@ main(int argc, const char **argv)

 		fprintf(stderr, _("Error parsing arguments: %s.\n"),

 			poptStrerror(c));

 		poptPrintUsage(popt, stderr, 0);

-		exit(1);

+		result = 1;

+		goto done;

 	}

 	name = poptGetArg(popt);

@@ -73,7 +75,8 @@ main(int argc, const char **argv)

 	if (name == NULL) {

 		fprintf(stderr, _("No group name specified.\n"));

 		poptPrintUsage(popt, stderr, 0);

-		return 1;

+		result = 1;

+		goto done;

 	}

 	if (gid_number_str != NULL) {

@@ -87,13 +90,12 @@ main(int argc, const char **argv)

 			fprintf(stderr, _("Invalid group ID %s\n"),

 				gid_number_str);

 			poptPrintUsage(popt, stderr, 0);

-			return 1;

+			result = 1;

+			goto done;

 		}

 		gidNumber = val;

 	}

-	poptFreeContext(popt);

-

 	/* Start up the library. */

 	ctx = lu_start(NULL, 0, NULL, NULL,

 		       interactive ? lu_prompt_console :

@@ -101,7 +103,8 @@ main(int argc, const char **argv)

 	if (ctx == NULL) {

 		fprintf(stderr, _("Error initializing %s: %s.\n"), PACKAGE,

 			lu_strerror(error));

-		return 1;

+		result = 1;

+		goto done;

 	}

 	/* Create a group entity object holding sensible defaults for a

@@ -120,17 +123,22 @@ main(int argc, const char **argv)

 			lu_strerror(error));

 		lu_audit_logger(AUDIT_ADD_GROUP, "add-group", name,

 				AUDIT_NO_ID, 0);

-		return 2;

+		result = 2;

+		goto done;

 	}

 	lu_nscd_flush_cache(LU_NSCD_CACHE_GROUP);

-	lu_ent_free(ent);

-

-	lu_end(ctx);

-

 	lu_audit_logger(AUDIT_ADD_GROUP, "add-group", name,

 				AUDIT_NO_ID, 1);

+	result = 0;

+

+ done:

+	if (ent) lu_ent_free(ent);

+

+	if (ctx) lu_end(ctx);

+

+	poptFreeContext(popt);

-	return 0;

+	return result;

 }

diff --git a/apps/lgroupdel.c b/apps/lgroupdel.c

index c5ccbed..f427924 100644

--- a/apps/lgroupdel.c

+++ b/apps/lgroupdel.c

@@ -30,12 +30,13 @@

 int

 main(int argc, const char **argv)

 {

-	struct lu_context *ctx;

-	struct lu_ent *ent;

+	struct lu_context *ctx = NULL;

+	struct lu_ent *ent = NULL;

 	struct lu_error *error = NULL;

 	const char *group;

 	int interactive = FALSE;

 	int c;

+	int result;

 	poptContext popt;

 	struct poptOption options[] = {

@@ -57,7 +58,8 @@ main(int argc, const char **argv)

 		fprintf(stderr, _("Error parsing arguments: %s.\n"),

 			poptStrerror(c));

 		poptPrintUsage(popt, stderr, 0);

-		exit(1);

+		result = 1;

+		goto done;

 	}

 	group = poptGetArg(popt);

@@ -65,11 +67,10 @@ main(int argc, const char **argv)

 	if (group == NULL) {

 		fprintf(stderr, _("No group name specified.\n"));

 		poptPrintUsage(popt, stderr, 0);

-		return 1;

+		result = 1;

+		goto done;

 	}

-	poptFreeContext(popt);

-

 	/* Start up the library. */

 	ctx = lu_start(NULL, 0, NULL, NULL,

 		       interactive ? lu_prompt_console :

@@ -77,14 +78,16 @@ main(int argc, const char **argv)

 	if (ctx == NULL) {

 		fprintf(stderr, _("Error initializing %s: %s.\n"), PACKAGE,

 			lu_strerror(error));

-		return 1;

+		result = 1;

+		goto done;

 	}

 	/* Look up the group structure. */

 	ent = lu_ent_new();

 	if (lu_group_lookup_name(ctx, group, ent, &error) == FALSE) {

 		fprintf(stderr, _("Group %s does not exist.\n"), group);

-		return 2;

+		result = 2;

+		goto done;

 	}

 	/* Delete the group. */

@@ -93,17 +96,22 @@ main(int argc, const char **argv)

 			group, lu_strerror(error));

 		lu_audit_logger(AUDIT_DEL_GROUP, "delete-group", group,

 				AUDIT_NO_ID, 0);

-		return 3;

+		result = 3;

+		goto done;

 	}

 	lu_nscd_flush_cache(LU_NSCD_CACHE_GROUP);

-	lu_ent_free(ent);

-

-	lu_end(ctx);

-

 	lu_audit_logger(AUDIT_DEL_GROUP, "delete-group", group,

 			AUDIT_NO_ID, 1);

+	result = 0;

+

+ done:

+	if (ent) lu_ent_free(ent);

+

+	if (ctx) lu_end(ctx);

+

+	poptFreeContext(popt);

-	return 0;

+	return result;

 }

diff --git a/apps/lgroupmod.c b/apps/lgroupmod.c

index 20be85f..8ade0ab 100644

--- a/apps/lgroupmod.c

+++ b/apps/lgroupmod.c

@@ -39,14 +39,16 @@ main(int argc, const char **argv)

 	char **admins, **members;

 	gid_t gidNumber = LU_VALUE_INVALID_ID;

 	gid_t oldGidNumber = LU_VALUE_INVALID_ID;

-	struct lu_context *ctx;

-	struct lu_ent *ent;

+	struct lu_context *ctx = NULL;

+	struct lu_ent *ent = NULL;

+	struct lu_ent *user_ent;

 	struct lu_error *error = NULL;

 	GPtrArray *users = NULL;

 	GValue val;

 	int change = FALSE, lock = FALSE, unlock = FALSE;

 	int interactive = FALSE;

 	int c;

+	int result;

 	poptContext popt;

 	struct poptOption options[] = {

@@ -85,14 +87,16 @@ main(int argc, const char **argv)

 		fprintf(stderr, _("Error parsing arguments: %s.\n"),

 			poptStrerror(c));

 		poptPrintUsage(popt, stderr, 0);

-		exit(1);

+		result = 1;

+		goto done;

 	}

 	group = poptGetArg(popt);

 	if (group == NULL) {

 		fprintf(stderr, _("No group name specified.\n"));

 		poptPrintUsage(popt, stderr, 0);

-		return 1;

+		result = 1;

+		goto done;

 	}

 	if (gid_number_str != NULL) {

 		intmax_t val;

@@ -105,32 +109,34 @@ main(int argc, const char **argv)

 			fprintf(stderr, _("Invalid group ID %s\n"),

 				gid_number_str);

 			poptPrintUsage(popt, stderr, 0);

-			return 1;

+			result = 1;

+			goto done;

 		}

 		gidNumber = val;

 	}

-	poptFreeContext(popt);

-

 	ctx = lu_start(NULL, 0, NULL, NULL,

 		       interactive ? lu_prompt_console :

 		       lu_prompt_console_quiet, NULL, &error);

 	if (ctx == NULL) {

 		fprintf(stderr, _("Error initializing %s: %s.\n"), PACKAGE,

 			lu_strerror(error));

-		return 1;

+		result = 1;

+		goto done;

 	}

 	if (lock && unlock) {

 		fprintf(stderr, _("Both -L and -U specified.\n"));

-		return 2;

+		result = 2;

+		goto done;

 	}

 	ent = lu_ent_new();

 	if (lu_group_lookup_name(ctx, group, ent, &error) == FALSE) {

 		fprintf(stderr, _("Group %s does not exist.\n"), group);

-		return 3;

+		result = 3;

+		goto done;

 	}

 	if (userPassword) {

@@ -141,7 +147,8 @@ main(int argc, const char **argv)

 			lu_audit_logger(AUDIT_GRP_CHAUTHTOK,

 					"changing-group-passwd", group,

 					AUDIT_NO_ID, 0);

-			return 4;

+			result = 4;

+			goto done;

 		}

 		lu_audit_logger(AUDIT_GRP_CHAUTHTOK,

 				"changing-group-passwd", group,

@@ -156,7 +163,8 @@ main(int argc, const char **argv)

 			lu_audit_logger(AUDIT_GRP_CHAUTHTOK,

 					"changing-group-passwd", group,

 					AUDIT_NO_ID, 0);

-			return 5;

+			result = 5;

+			goto done;

 		}

 		lu_audit_logger(AUDIT_GRP_CHAUTHTOK,

 				"changing-group-passwd", group,

@@ -171,7 +179,8 @@ main(int argc, const char **argv)

 			lu_audit_logger(AUDIT_GRP_MGMT,

 					"changing-group-lock", group,

 					AUDIT_NO_ID, 0);

-			return 6;

+			result = 6;

+			goto done;

 		}

 		lu_audit_logger(AUDIT_GRP_MGMT,

 				"changing-group-lock", group,

@@ -186,7 +195,8 @@ main(int argc, const char **argv)

 			lu_audit_logger(AUDIT_GRP_MGMT,

 					"changing-group-lock", group,

 					AUDIT_NO_ID, 0);

-			return 7;

+			result = 7;

+			goto done;

 		}

 		lu_audit_logger(AUDIT_GRP_MGMT,

 				"changing-group-lock", group,

@@ -268,7 +278,8 @@ main(int argc, const char **argv)

 		lu_audit_logger(AUDIT_GRP_MGMT,

 				"changing-group-members", group,

 				AUDIT_NO_ID, 0);

-		return 8;

+		result = 8;

+		goto done;

 	}

 	lu_audit_logger(AUDIT_GRP_MGMT,

 			"changing-group-members", group,

@@ -289,15 +300,14 @@ main(int argc, const char **argv)

 			lu_audit_logger(AUDIT_GRP_MGMT,

 				"changing-group-id", group,

 				AUDIT_NO_ID, 0);

-			return 8;

+			result = 8;

+			goto done;

 		}

 		lu_audit_logger(AUDIT_GRP_MGMT,

 			"changing-group-id", group,

 			AUDIT_NO_ID, 1);

 	}

-	lu_ent_free(ent);

-

 	lu_nscd_flush_cache(LU_NSCD_CACHE_GROUP);

 	if (oldGidNumber != LU_VALUE_INVALID_ID &&

@@ -305,22 +315,29 @@ main(int argc, const char **argv)

 		size_t i;

 		for (i = 0; i < users->len; i++) {

-			ent = g_ptr_array_index(users, i);

-			if (lu_ent_get_first_id(ent, LU_GIDNUMBER)

+			user_ent = g_ptr_array_index(users, i);

+			if (lu_ent_get_first_id(user_ent, LU_GIDNUMBER)

 			    == oldGidNumber) {

-				lu_ent_set_id(ent, LU_GIDNUMBER, gidNumber);

-				lu_user_modify(ctx, ent, &error);

+				lu_ent_set_id(user_ent, LU_GIDNUMBER, gidNumber);

+				lu_user_modify(ctx, user_ent, &error);

 				if (error != NULL)

 					lu_error_free(&error);

 			}

-			lu_ent_free(ent);

+			lu_ent_free(user_ent);

 		}

 		g_ptr_array_free(users, TRUE);

 		lu_nscd_flush_cache(LU_NSCD_CACHE_PASSWD);

 	}

-	lu_end(ctx);

+	result = 0;

+

+ done:

+	if (ent) lu_ent_free(ent);

+

+	if (ctx) lu_end(ctx);

+

+	poptFreeContext(popt);

-	return 0;

+	return result;

 }

diff --git a/apps/lid.c b/apps/lid.c

index 4b8afd9..cdcc122 100644

--- a/apps/lid.c

+++ b/apps/lid.c

@@ -103,12 +103,13 @@ int

 main(int argc, const char **argv)

 {

 	const char *name;

-	struct lu_context *ctx;

+	struct lu_context *ctx = NULL;

 	struct lu_error *error = NULL;

-	struct lu_ent *ent;

+	struct lu_ent *ent = NULL;

 	int interactive = FALSE;

 	int groupflag = FALSE, nameonly = FALSE;

 	int c;

+	int result;

 	poptContext popt;

 	struct poptOption options[] = {

 		{"interactive", 'i', POPT_ARG_NONE, &interactive, 0,

@@ -133,7 +134,8 @@ main(int argc, const char **argv)

 		fprintf(stderr, _("Error parsing arguments: %s.\n"),

 			poptStrerror(c));

 		poptPrintUsage(popt, stderr, 0);

-		exit(1);

+		result = 1;

+		goto done;