Blame SOURCES/shadow-4.6-coverity.patch

b95810
diff -up shadow-4.6/lib/commonio.c.coverity shadow-4.6/lib/commonio.c
b95810
--- shadow-4.6/lib/commonio.c.coverity	2018-10-10 09:50:59.307738194 +0200
b95810
+++ shadow-4.6/lib/commonio.c	2018-10-10 09:55:32.919319048 +0200
b95810
@@ -382,7 +382,7 @@ int commonio_lock_nowait (struct commoni
b95810
 	char* lock = NULL;
b95810
 	size_t lock_file_len;
b95810
 	size_t file_len;
b95810
-	int err;
b95810
+	int err = 0;
b95810
 
b95810
 	if (db->locked) {
b95810
 		return 1;
b95810
@@ -391,12 +391,10 @@ int commonio_lock_nowait (struct commoni
b95810
 	lock_file_len = strlen(db->filename) + 6; /* sizeof ".lock" */
b95810
 	file = (char*)malloc(file_len);
b95810
 	if(file == NULL) {
b95810
-		err = ENOMEM;
b95810
 		goto cleanup_ENOMEM;
b95810
 	}
b95810
 	lock = (char*)malloc(lock_file_len);
b95810
 	if(lock == NULL) {
b95810
-		err = ENOMEM;
b95810
 		goto cleanup_ENOMEM;
b95810
 	}
b95810
 	snprintf (file, file_len, "%s.%lu",
b95810
diff -up shadow-4.6/libmisc/console.c.coverity shadow-4.6/libmisc/console.c
b95810
--- shadow-4.6/libmisc/console.c.coverity	2018-04-29 18:42:37.000000000 +0200
b95810
+++ shadow-4.6/libmisc/console.c	2018-10-10 11:56:51.368837533 +0200
b95810
@@ -50,7 +50,7 @@ static bool is_listed (const char *cfgin
b95810
 static bool is_listed (const char *cfgin, const char *tty, bool def)
b95810
 {
b95810
 	FILE *fp;
b95810
-	char buf[200], *s;
b95810
+	char buf[1024], *s;
b95810
 	const char *cons;
b95810
 
b95810
 	/*
b95810
@@ -70,7 +70,8 @@ static bool is_listed (const char *cfgin
b95810
 
b95810
 	if (*cons != '/') {
b95810
 		char *pbuf;
b95810
-		strcpy (buf, cons);
b95810
+		strncpy (buf, cons, sizeof (buf));
b95810
+		buf[sizeof (buf) - 1] = '\0';
b95810
 		pbuf = &buf[0];
b95810
 		while ((s = strtok (pbuf, ":")) != NULL) {
b95810
 			if (strcmp (s, tty) == 0) {
b95810
diff -up shadow-4.6/lib/spawn.c.coverity shadow-4.6/lib/spawn.c
b95810
--- shadow-4.6/lib/spawn.c.coverity	2018-04-29 18:42:37.000000001 +0200
b95810
+++ shadow-4.6/lib/spawn.c	2018-10-10 11:36:49.035784609 +0200
b95810
@@ -69,7 +69,7 @@ int run_command (const char *cmd, const
b95810
 	do {
b95810
 		wpid = waitpid (pid, status, 0);
b95810
 	} while (   ((pid_t)-1 == wpid && errno == EINTR)
b95810
-	         || (wpid != pid));
b95810
+	         || ((pid_t)-1 != wpid && wpid != pid));
b95810
 
b95810
 	if ((pid_t)-1 == wpid) {
b95810
 		fprintf (stderr, "%s: waitpid (status: %d): %s\n",
b95810
diff -up shadow-4.6/src/useradd.c.coverity shadow-4.6/src/useradd.c
b95810
--- shadow-4.6/src/useradd.c.coverity	2018-10-10 09:50:59.303738098 +0200
b95810
+++ shadow-4.6/src/useradd.c	2018-10-12 13:51:54.480490257 +0200
b95810
@@ -314,7 +314,7 @@ static void fail_exit (int code)
b95810
 static void get_defaults (void)
b95810
 {
b95810
 	FILE *fp;
b95810
-	char* default_file = USER_DEFAULTS_FILE;
b95810
+	char *default_file = USER_DEFAULTS_FILE;
b95810
 	char buf[1024];
b95810
 	char *cp;
b95810
 
b95810
@@ -324,6 +324,8 @@ static void get_defaults (void)
b95810
 
b95810
 		len = strlen(prefix) + strlen(USER_DEFAULTS_FILE) + 2;
b95810
 		default_file = malloc(len);
b95810
+                if (default_file == NULL)
b95810
+                       return;
b95810
 		wlen = snprintf(default_file, len, "%s/%s", prefix, USER_DEFAULTS_FILE);
b95810
 		assert (wlen == (int) len -1);
b95810
 	}
b95810
@@ -334,7 +336,7 @@ static void get_defaults (void)
b95810
 
b95810
 	fp = fopen (default_file, "r");
b95810
 	if (NULL == fp) {
b95810
-		return;
b95810
+		goto getdef_err;
b95810
 	}
b95810
 
b95810
 	/*
b95810
@@ -445,7 +447,7 @@ static void get_defaults (void)
b95810
 		}
b95810
 	}
b95810
 	(void) fclose (fp);
b95810
-
b95810
+     getdef_err:
b95810
 	if(prefix[0]) {
b95810
 		free(default_file);
b95810
 	}
b95810
@@ -480,8 +482,8 @@ static int set_defaults (void)
b95810
 	FILE *ifp;
b95810
 	FILE *ofp;
b95810
 	char buf[1024];
b95810
-	char* new_file = NEW_USER_FILE;
b95810
-	char* default_file = USER_DEFAULTS_FILE;
b95810
+	char *new_file = NULL;
b95810
+	char *default_file = USER_DEFAULTS_FILE;
b95810
 	char *cp;
b95810
 	int ofd;
b95810
 	int wlen;
b95810
@@ -492,17 +494,30 @@ static int set_defaults (void)
b95810
 	bool out_shell = false;
b95810
 	bool out_skel = false;
b95810
 	bool out_create_mail_spool = false;
b95810
+	size_t len;
b95810
+	int ret = -1;
b95810
 
b95810
-	if(prefix[0]) {
b95810
-		size_t len;
b95810
 
b95810
-		len = strlen(prefix) + strlen(NEW_USER_FILE) + 2;
b95810
-		new_file = malloc(len);
b95810
-		wlen = snprintf(new_file, len, "%s/%s", prefix, NEW_USER_FILE);
b95810
-		assert (wlen == (int) len -1);
b95810
+	len = strlen(prefix) + strlen(NEW_USER_FILE) + 2;
b95810
+	new_file = malloc(len);
b95810
+        if (new_file == NULL) {
b95810
+		fprintf (stderr,
b95810
+		         _("%s: cannot create new defaults file: %s\n"),
b95810
+		         Prog, strerror(errno));
b95810
+		return -1;
b95810
+        }
b95810
+	wlen = snprintf(new_file, len, "%s%s%s", prefix, prefix[0]?"/":"", NEW_USER_FILE);
b95810
+	assert (wlen <= (int) len -1);
b95810
 
b95810
+	if(prefix[0]) {
b95810
 		len = strlen(prefix) + strlen(USER_DEFAULTS_FILE) + 2;
b95810
 		default_file = malloc(len);
b95810
+		if (default_file == NULL) {
b95810
+			fprintf (stderr,
b95810
+			         _("%s: cannot create new defaults file: %s\n"),
b95810
+			         Prog, strerror(errno));
b95810
+			goto setdef_err;
b95810
+		}
b95810
 		wlen = snprintf(default_file, len, "%s/%s", prefix, USER_DEFAULTS_FILE);
b95810
 		assert (wlen == (int) len -1);
b95810
 	}
b95810
@@ -515,7 +530,7 @@ static int set_defaults (void)
b95810
 		fprintf (stderr,
b95810
 		         _("%s: cannot create new defaults file\n"),
b95810
 		         Prog);
b95810
-		return -1;
b95810
+		goto setdef_err;
b95810
 	}
b95810
 
b95810
 	ofp = fdopen (ofd, "w");
b95810
@@ -523,7 +538,7 @@ static int set_defaults (void)
b95810
 		fprintf (stderr,
b95810
 		         _("%s: cannot open new defaults file\n"),
b95810
 		         Prog);
b95810
-		return -1;
b95810
+		goto setdef_err;
b95810
 	}
b95810
 
b95810
 	/*
b95810
@@ -550,7 +565,7 @@ static int set_defaults (void)
b95810
 				         _("%s: line too long in %s: %s..."),
b95810
 				         Prog, default_file, buf);
b95810
 				(void) fclose (ifp);
b95810
-				return -1;
b95810
+				goto setdef_err;
b95810
 			}
b95810
 		}
b95810
 
b95810
@@ -614,7 +629,7 @@ static int set_defaults (void)
b95810
 	    || (fsync (fileno (ofp)) != 0)
b95810
 	    || (fclose (ofp) != 0)) {
b95810
 		unlink (new_file);
b95810
-		return -1;
b95810
+		goto setdef_err;
b95810
 	}
b95810
 
b95810
 	/*
b95810
@@ -629,7 +644,7 @@ static int set_defaults (void)
b95810
 		         _("%s: Cannot create backup file (%s): %s\n"),
b95810
 		         Prog, buf, strerror (err));
b95810
 		unlink (new_file);
b95810
-		return -1;
b95810
+		goto setdef_err;
b95810
 	}
b95810
 
b95810
 	/*
b95810
@@ -640,11 +655,11 @@ static int set_defaults (void)
b95810
 		fprintf (stderr,
b95810
 		         _("%s: rename: %s: %s\n"),
b95810
 		         Prog, new_file, strerror (err));
b95810
-		return -1;
b95810
+		goto setdef_err;
b95810
 	}
b95810
 #ifdef WITH_AUDIT
b95810
 	audit_logger (AUDIT_USYS_CONFIG, Prog,
b95810
-	              "changing-useradd-defaults",
b95810
+	              "changing useradd defaults",
b95810
 	              NULL, AUDIT_NO_ID,
b95810
 	              SHADOW_AUDIT_SUCCESS);
b95810
 #endif
b95810
@@ -654,13 +669,14 @@ static int set_defaults (void)
b95810
 	         (unsigned int) def_group, def_home, def_shell,
b95810
 	         def_inactive, def_expire, def_template,
b95810
 	         def_create_mail_spool));
b95810
-
b95810
+	ret = 0;
b95810
+    setdef_err:
b95810
+	free(new_file);
b95810
 	if(prefix[0]) {
b95810
-		free(new_file);
b95810
 		free(default_file);
b95810
 	}
b95810
 
b95810
-	return 0;
b95810
+	return ret;
b95810
 }
b95810
 
b95810
 /*