834d09c Merge remote-tracking branch 'upstream/main' — HardenedBSD-pkg

added Leak.suppress.in

@@ -0,0 +1,22 @@

 # Unfixable leak reports from system libraries on MacOS
 leak:fork
 leak:dyld4::Loader::*
 # Suspected unfixable leak from within libcrypto on Ubuntu
 # Direct leak of 32 byte(s) in 1 object(s) allocated from:
 #    #0 0x55558b4c7293 in malloc (/home/runner/work/pkg/pkg/build.pkg/src/pkg+0x1e7293) (BuildId: 0d38bdca4c756f735a194bf765528e76b46c416f)
 #    #1 0x7f2a7f2237c4 in CRYPTO_zalloc (/lib/x86_64-linux-gnu/libcrypto.so.3+0x2237c4) (BuildId: c503df82cf13681b2f81e1097e857e3fc50679b1)
 #    #2 0x7f2a7f11afa3 in BUF_MEM_new (/lib/x86_64-linux-gnu/libcrypto.so.3+0x11afa3) (BuildId: c503df82cf13681b2f81e1097e857e3fc50679b1)
 #    #3 0x7f2a7f11b004 in BUF_MEM_new_ex (/lib/x86_64-linux-gnu/libcrypto.so.3+0x11b004) (BuildId: c503df82cf13681b2f81e1097e857e3fc50679b1)
 #    #4 0x7f2a7f0f79dd  (/lib/x86_64-linux-gnu/libcrypto.so.3+0xf79dd) (BuildId: c503df82cf13681b2f81e1097e857e3fc50679b1)
 #    #5 0x7f2a7f0ed883 in BIO_new_ex (/lib/x86_64-linux-gnu/libcrypto.so.3+0xed883) (BuildId: c503df82cf13681b2f81e1097e857e3fc50679b1)
 leak:BIO_new_ex
 # UCL should be investigated first within UCL, there is plenty to look at
 leak:ucl_parser_add_fd
 ## FIXME: Temporarily suppress inside pkg source
 # this could be a dangling pointer false positive report, the whole function should be re-structured
 leak:pkgdb_open_all2
 \ No newline at end of file

modified Makefile.autosetup

@@ -21,8 +21,9 @@ check: all

 @if TESTS
 all: Kyuafile
 check: UndefinedBehaviour.suppress
 check: UndefinedBehaviour.suppress Leak.suppress
 	export UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1:suppressions=$(top_builddir)/UndefinedBehaviour.suppress; \
 	export LSAN_OPTIONS=print_suppressions=0:suppressions=$(top_builddir)/Leak.suppress; \
 	export ASAN_OPTIONS=detect_leaks=1; \
 	export LLVM_PROFILE_FILE=/tmp/pkg.%p.profraw; \
 	if [ "$(HTML)" != "" ]; then \

modified libpkg/pkg.c

@@ -67,6 +67,7 @@ pkg_free(struct pkg *pkg)

 	free(pkg->desc);
 	free(pkg->sum);
 	free(pkg->repopath);
 	free(pkg->reponame);
 	free(pkg->repourl);
 	free(pkg->reason);
 	free(pkg->dep_formula);

@@ -1559,7 +1560,7 @@ pkg_message_from_str(struct pkg *pkg, const char *str, size_t len)

 		ucl_parser_register_variable(parser, "PKGORIGIN", pkg->origin);
 	}
 	if (pkg->maintainer != NULL) {
 		ucl_parser_register_variable(parser, "MAINTAINER", pkg->origin);
 		ucl_parser_register_variable(parser, "MAINTAINER", pkg->maintainer);
 	}
 	if (ucl_parser_add_chunk(parser, (const unsigned char*)str, len)) {

modified libpkg/pkg_add.c

@@ -1605,6 +1605,8 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,

 	}
 cleanup:
 	tll_free(symlinks_allowed);
 	if (openxact)
 		pkgdb_register_finale(db, retcode, NULL);
 	if (a != NULL) {

modified libpkg/pkg_create.c

@@ -110,6 +110,7 @@ pkg_create_from_dir(struct pkg *pkg, const char *root,

 			flatsize += file->size;
 		}
 		free(file->sum);
 		file->sum = pkg_checksum_generate_file(fpath,
 		    PKG_HASH_TYPE_SHA256_HEX);
 		if (file->sum == NULL) {

modified libpkg/pkg_delete.c

@@ -269,8 +269,10 @@ pkg_effective_rmdir(struct pkgdb *db, struct pkg *pkg)

 	char prefix_r[MAXPATHLEN];
 	snprintf(prefix_r, sizeof(prefix_r), "%s", pkg->prefix[0] ? pkg->prefix + 1 : "");
 	tll_foreach(pkg->dir_to_del, d)
 	tll_foreach(pkg->dir_to_del, d) {
 		rmdir_p(db, pkg, d->item, prefix_r);
 		tll_remove_and_free(pkg->dir_to_del, d, free);
 	}
 }
 void

modified libpkg/pkg_jobs_universe.c

@@ -689,6 +689,7 @@ pkg_jobs_universe_free(struct pkg_jobs_universe *universe)

 	while (pkghash_next(&it))
 		pkg_jobs_universe_provide_free(it.value);
 	pkghash_destroy(universe->provides);
 	free(universe);
 }
 struct pkg_jobs_universe *

modified libpkg/pkg_manifest.c

@@ -609,7 +609,6 @@ pkg_set_files_from_object(struct pkg *pkg, const ucl_object_t *obj)

 	const char *sum = NULL;
 	const char *uname = NULL;
 	const char *gname = NULL;
 	void *set = NULL;
 	mode_t perm = 0;
 	xstring *fname = NULL;
 	const char *key, *okey;

@@ -631,11 +630,13 @@ pkg_set_files_from_object(struct pkg *pkg, const ucl_object_t *obj)

 			sum = ucl_object_tostring(cur);
 		else if (STRIEQ(key, "perm") &&
 			 (cur->type == UCL_STRING || cur->type == UCL_INT)) {
 			void *set = 0;
 			if ((set = setmode(ucl_object_tostring_forced(cur))) == NULL)
 				pkg_emit_error("Not a valid mode: %s",
 				    ucl_object_tostring(cur));
 			else
 				perm = getmode(set, 0);
 			free(set);
 		} else {
 			dbg(1, "Skipping unknown key for file(%s): %s",
 			    fname->buf, key);

@@ -656,7 +657,6 @@ pkg_set_dirs_from_object(struct pkg *pkg, const ucl_object_t *obj)

 	ucl_object_iter_t it = NULL;
 	const char *uname = NULL;
 	const char *gname = NULL;
 	void *set;
 	mode_t perm = 0;
 	xstring *dirname = NULL;
 	const char *key, *okey;

@@ -675,11 +675,13 @@ pkg_set_dirs_from_object(struct pkg *pkg, const ucl_object_t *obj)

 			gname = ucl_object_tostring(cur);
 		else if (STRIEQ(key, "perm") &&
 			 (cur->type == UCL_STRING || cur->type == UCL_INT)) {
 			void *set = 0;
 			if ((set = setmode(ucl_object_tostring_forced(cur))) == NULL)
 				pkg_emit_error("Not a valid mode: %s",
 				    ucl_object_tostring(cur));
 			else
 				perm = getmode(set, 0);
 			free(set);
 		} else if (STRIEQ(key, "try") && cur->type == UCL_BOOLEAN) {
 			/* ignore on purpose : compatibility*/
 		} else {

modified libpkg/pkg_ports.c

@@ -971,8 +971,7 @@ flush_script_buffer(xstring *buf, struct pkg *p, int type)

 int
 plist_parse_line(struct plist *plist, char *line)
 {
 	char *keyword, *buf, *bkpline;
 	struct file_attr *a;
 	char *buf, *bkpline;
 	if (line[0] == '\0')
 		return (EPKG_OK);

@@ -981,12 +980,13 @@ plist_parse_line(struct plist *plist, char *line)

 	bkpline = xstrdup(line);
 	if (line[0] == '@') {
 		keyword = NULL;
 		a = NULL;
 		char *keyword = 0;
 		struct file_attr *a = 0;
 		buf = extract_keywords(line + 1, &keyword, &a);
 		if (buf == NULL) {
 			pkg_emit_error("Malformed keyword %s, expecting @keyword "
 			    "or @keyword(owner,group,mode)", bkpline);
 			free_file_attr(a);
 			free(bkpline);
 			return (EPKG_FATAL);
 		}

@@ -997,9 +997,11 @@ plist_parse_line(struct plist *plist, char *line)

 			    keyword, line);
 			/* FALLTHRU */
 		case EPKG_FATAL:
 			free_file_attr(a);
 			free(bkpline);
 			return (EPKG_FATAL);
 		}
 		free_file_attr(a);
 	} else {
 		buf = line;
 		strlcpy(plist->last_file, buf, sizeof(plist->last_file));

modified libpkg/pkg_repo_create.c

@@ -897,11 +897,13 @@ pkg_repo_create(struct pkg_repo_create *prc, char *path)

 	for (int i = 0; i < num_workers; i++)
 		pthread_join(threads[i], NULL);
 	free(threads);
 	ucl_object_emit_streamline_end_container(te.ctx);
 	pkg_emit_progress_tick(len, len);
 	ucl_object_emit_streamline_finish(te.ctx);
 	ucl_object_emit_funcs_free(f);
 	ucl_object_unref(obj);
 	ucl_object_unref(ar);
 	/* Write metafile */

@@ -1003,6 +1005,7 @@ pkg_repo_sign(const char *path, char **argv, int argc, char **sig, size_t *sigle

 			fwrite(line, linelen, 1, buf->fp);
 		}
 	}
 	free(line);
 	*sigtype = xstring_get(typestr);
 	*cert = xstring_get_binary(certstr, certlen);

@@ -1114,6 +1117,8 @@ pack_command_sign(struct packing *pack, const char *path, char **argv, int argc,

 		iov[offset].iov_base = buf;
 		iov[offset++].iov_len = size;
 	} else {
 		free(sigtype);
 	}
 	iov[offset].iov_base = sig;

modified libpkg/pkg_repo_meta.c

@@ -81,9 +81,11 @@ pkg_repo_meta_free(struct pkg_repo_meta *meta)

 		free(meta->conflicts);
 		free(meta->manifests);
 		free(meta->digests);
 		free(meta->data);
 		free(meta->fulldb);
 		free(meta->filesite);
 		free(meta->conflicts_archive);
 		free(meta->data_archive);
 		free(meta->manifests_archive);
 		free(meta->digests_archive);
 		free(meta->fulldb_archive);

modified libpkg/pkgdb.c

@@ -1609,7 +1609,10 @@ run_prstmt(sql_prstmt_index s, ...)

 	va_end(ap);
 	dbg(4, "running '%s'", sqlite3_expanded_sql(stmt));
 	char *debug_sql = sqlite3_expanded_sql(stmt);
 	dbg(4, "running '%s'", debug_sql);
 	sqlite3_free(debug_sql);
 	retcode = sqlite3_step(stmt);
 	return (retcode);

modified src/event.c

@@ -698,7 +698,7 @@ event_callback(void *data, struct pkg_event *ev)

 			evtmp = it->item;
 			if (evtmp->cb == ev->e_cleanup_callback.cleanup_cb &&
 			    evtmp->data == ev->e_cleanup_callback.data) {
 				tll_remove(cleanup_list, it);
 				tll_remove_and_free(cleanup_list, it, free);
 				break;
 			}
 		}

modified src/repo.c

@@ -112,19 +112,23 @@ exec_repo(int argc, char **argv)

 	pkg_repo_create_set_sign(prc, argv + 1, argc - 1, password_cb);
 	if (argc < 1) {
 		pkg_repo_create_free(prc);
 		usage_repo();
 		return (EXIT_FAILURE);
 	}
 	if (argc > 2 && !STREQ(argv[1], "signing_command:")) {
 		pkg_repo_create_free(prc);
 		usage_repo();
 		return (EXIT_FAILURE);
 	}
 	if (pkg_repo_create(prc, argv[0]) != EPKG_OK) {
 		printf("Cannot create repository catalogue\n");
 		pkg_repo_create_free(prc);
 		return (EXIT_FAILURE);
 	}
 	pkg_repo_create_free(prc);
 	return (EXIT_SUCCESS);
 }

modified src/updating.c

@@ -56,6 +56,25 @@ struct regex_cache {

 	regex_t reg;
 };
 static void
 installed_ports_free(struct installed_ports *p)
 {
 	if (!p)
 		return;
 	free(p->origin);
 	free(p);
 }
 static void
 regex_cache_free(struct regex_cache *p)
 {
 	if (!p)
 		return;
 	free(p->pattern);
 	free(p);
 }
 void
 usage_updating(void)
 {

@@ -199,14 +218,13 @@ matcher(const char *affects, const char *origin, bool ignorecase)

 				goto out;
 			}
 			if ((ent->pattern = strdup(words[i])) == NULL) {
 				free(ent);
 				regex_cache_free(ent);
 				ret = 0;
 				goto out;
 			}
 			re = convert_re(words[i]);
 			if (re == NULL) {
 				free(ent->pattern);
 				free(ent);
 				regex_cache_free(ent);
 				ret = 0;
 				goto out;
 			}

@@ -221,6 +239,8 @@ matcher(const char *affects, const char *origin, bool ignorecase)

 	}
 out:
 	tll_foreach(cache, it)
 		tll_remove_and_free(cache, it, regex_cache_free);
 	free(words);
 	free(buf);
 	return (ret);

@@ -345,6 +365,7 @@ exec_updating(int argc, char **argv)

 	while (getline(&line, &linecap, fd) > 0) {
 		if (strspn(line, "0123456789:") == 9) {
 			free(dateline);
 			dateline = strdup(line);
 			found = 0;
 			head = 1;

@@ -380,10 +401,13 @@ exec_updating(int argc, char **argv)

 	fclose(fd);
 cleanup:
 	tll_foreach(origins, it)
 		tll_remove_and_free(origins, it, installed_ports_free);
 	pkgdb_it_free(it);
 	pkgdb_release_lock(db, PKGDB_LOCK_READONLY);
 	pkgdb_close(db);
 	pkg_free(pkg);
 	free(line);
 	free(dateline);
 	return (retcode);

modified src/upgrade.c

@@ -217,6 +217,8 @@ add_vulnerable_upgrades(struct pkg_jobs *jobs, struct pkgdb *db)

 		}
 	}
 	free(line);
 	fclose(in);
 	while (waitpid(cld, &retcode, 0) == -1) {

modified src/utils.c

@@ -191,6 +191,7 @@ vquery_yesno(bool deft, const char *msg, va_list ap)

 		}
 	}
 	free(line);
 	free(out);
 	return (r);