From nobody Thu Nov 19 13:24:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jVfLn6Rl5z7109P for ; Thu, 19 Nov 2026 13:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVfLn3mc6z4Rhm for ; Thu, 19 Nov 2026 13:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795094641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=134BB9ynFGZGmVjT02CMCOF5NTF1s/pqfVs3RWBQYHc=; b=nu/0d0ImnLXk+vmdlMSeeUZTLNhMhhetQEliU03mae/4HQdPeRDpVagkwSh9VfwsxmpQW9 gRUPNq+ks750rHOJ7EsarGiJek2eeHswsgqqjEay50MmabEF+0WepYvoMU0YZ4C9zpGi4U zUA5fvoG8oDP1glF3QpZ/deoZX5y6vPk+qSPnczXAq6nYaex7nESlHczUfjuNNAfxs6d78 Z/WhW7T/ayAPs92ZqGC7ZrZNITkLwilIbXvUUactI5ZVeUaKjx8INlTQIV64KrMk4142lz jZIIyhbOx0c7VpSS4WoIKUfdoaNqXjidn7cysz1sbwFLcl4nt9rRXCx7VyPN3g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795094641; b=JKLgPcCUi0jDMYgjhXgD38NF0ln04KxT6F7wwDnJsMY2qGy3WP27E6AGEEAZGOOS8HQtdh Q5BRua7jvDI7X+GKzvyo4W92scybGXPl1+eSa8NhO//tl6m61Nkv98XMym9rDl3oNdOSvx jheVPAqeYk9LPBjncOQgHCbjhWwrRPuiBU3dnNcdN4eO6GlH3t324H2xZrqc3Wr9nBzcad QNbUayl0LvYs700PgJmiBPlxOtUfzhBrhWLL3JhyiCDfdrLcQBUKh8svpGLsX/X4xgi8Jz X+tLXUWfqVWxUG80iFYeBhApydx/DLQRzwF74avhQwZKl7E6Hf7RtxZCE0HPgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795094641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=134BB9ynFGZGmVjT02CMCOF5NTF1s/pqfVs3RWBQYHc=; b=nuBejPakAGSFcfjWw+spWYwz5OFLG8vDXDNQbLZ5azQ2xpsu+X1mQNhoAVGAmZQjRmxhyJ 0yINVLi8G4YUbP9tyDIn/h4tBD46ThZuuGGCe6vyzpNT280Yk0zxO0PDCWle9vuKXSuMqt +7AfVPB0IleztOPQoHBbldqvmoOLfXUhkeffftCXtBNDc+/9q42BWKGt3b+rbKx9fOm+tD rupQ9AZZyOB/JOO6zQI/lnptR1reqVpn90FGegOSqVDTLDA0re9B252lTimeZlKnD50JSo AosdUm5f2r4+2uSoPIxeVI8gLmuFx2yxv9pGICkzX4cOMXUzW+ckL2hhugugVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jVfLn31Xkz137V for ; Thu, 19 Nov 2026 13:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ec16 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 13:24:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 7f6245fd8e4e - main - pkg: Fix issues raised by clang-analyzer List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f6245fd8e4e1ec8c835d3e7e21b82774efe5c7b Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 13:24:01 +0000 Message-Id: <6afef871.1ec16.a77de3@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7f6245fd8e4e1ec8c835d3e7e21b82774efe5c7b commit 7f6245fd8e4e1ec8c835d3e7e21b82774efe5c7b Author: Dag-Erling Smørgrav AuthorDate: 2026-11-19 13:23:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-19 13:23:46 +0000 pkg: Fix issues raised by clang-analyzer MFC after: 1 week Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D58454 --- usr.sbin/pkg/config.c | 16 +++++++++++----- usr.sbin/pkg/ecc.c | 18 ++++++------------ usr.sbin/pkg/pkg.c | 11 ++++++----- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c index 8405a4c658fb..21535c813806 100644 --- a/usr.sbin/pkg/config.c +++ b/usr.sbin/pkg/config.c @@ -31,15 +31,16 @@ #include #include +#include +#include #include -#include #include #include #include #include #include +#include #include -#include #include "config.h" @@ -237,12 +238,17 @@ config_parse(const ucl_object_t *obj) continue; if (buf != NULL) memset(buf, 0, bufsz); + errno = 0; rewind(buffp); + assert(errno == 0); /* rewinding a memstream never fails */ - for (j = 0; j < strlen(key); ++j) - fputc(toupper(key[j]), buffp); - fflush(buffp); + for (j = 0; key[j] != '\0'; ++j) + if (fputc(toupper(key[j]), buffp) == EOF) + err(1, NULL); /* failed to allocate */ + if (fflush(buffp) != 0) + err(1, NULL); /* failed to allocate */ + assert(buf != NULL); for (i = 0; i < CONFIG_SIZE; i++) { if (strcmp(buf, c[i].key) == 0) break; diff --git a/usr.sbin/pkg/ecc.c b/usr.sbin/pkg/ecc.c index 01ce020bdba0..a975049e5739 100644 --- a/usr.sbin/pkg/ecc.c +++ b/usr.sbin/pkg/ecc.c @@ -306,7 +306,6 @@ ecc_extract_key_params(const uint8_t *oid, size_t oidlen, if (oidlen != 1) return (1); - ret = -1; switch (*oid) { case 0x0a: /* secp256k1 */ ret = import_params(rawparams, &secp256k1_str_params); @@ -318,12 +317,10 @@ ecc_extract_key_params(const uint8_t *oid, size_t oidlen, ret = import_params(rawparams, &secp521r1_str_params); break; default: - return (1); + ret = -1; } - if (ret == 0) - return (0); - return (1); + return (ret != 0); } if (oidlen >= sizeof(oid_brainpoolP) && @@ -334,7 +331,6 @@ ecc_extract_key_params(const uint8_t *oid, size_t oidlen, if (oidlen != 1) return (1); - ret = -1; switch (*oid) { case 0x07: /* brainpoolP256r1 */ ret = import_params(rawparams, &brainpoolp256r1_str_params); @@ -361,12 +357,10 @@ ecc_extract_key_params(const uint8_t *oid, size_t oidlen, ret = import_params(rawparams, &brainpoolp512t1_str_params); break; default: - return (1); + ret = -1; } - if (ret == 0) - return (0); - return (1); + return (ret != 0); } #ifdef ECC_DEBUG @@ -526,14 +520,14 @@ ecc_verify_data(const struct pkgsign_ctx *sctx, int ret; struct ecc_verify_cbdata cbdata; - ret = 1; - if (sigfile != NULL) { cbdata.keyfp = fopen(sigfile, "r"); if (cbdata.keyfp == NULL) { warn("fopen: %s", sigfile); return (false); } + cbdata.key = NULL; + cbdata.keylen = SIZE_MAX; } else { cbdata.keyfp = NULL; cbdata.key = key; diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index d6cb10797fb4..28f238d5a5e5 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -653,6 +653,7 @@ parse_cert(int fd) { fwrite(line, 1, linelen, tmpfp); } + free(line); fclose(fp); fclose(sigfp); fclose(certfp); @@ -688,11 +689,11 @@ static bool verify_pubsignature(int fd_pkg, int fd_sig, struct repository *r) { struct pubkey *pk; - char *data; struct pkgsign_ctx *sctx; + const char *pubkey; + char *data; size_t datasz; bool ret; - const char *pubkey; pk = NULL; sctx = NULL; @@ -743,8 +744,8 @@ verify_pubsignature(int fd_pkg, int fd_sig, struct repository *r) } /* Verify the signature. */ - printf("Verifying signature with public key %s.a.. ", r->pubkey); - if (pkgsign_verify_data(sctx, data, datasz, r->pubkey, NULL, 0, pk->sig, + printf("Verifying signature with public key %s.a.. ", pubkey); + if (pkgsign_verify_data(sctx, data, datasz, pubkey, NULL, 0, pk->sig, pk->siglen) == false) { fprintf(stderr, "Signature is not valid\n"); goto cleanup; @@ -1381,5 +1382,5 @@ main(int argc, char *argv[]) execv(pkgpath, __DECONST(char **, pkgargv)); /* NOT REACHED */ - return (EXIT_FAILURE); + exit(EXIT_FAILURE); }