From nobody Fri Jun 30 14:42:34 2023 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 4Qsyj40WPzz4kSjC for ; Fri, 30 Jun 2023 14:42:48 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qsyj361Vjz43QW for ; Fri, 30 Jun 2023 14:42:47 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-3fbc77e76abso7744075e9.1 for ; Fri, 30 Jun 2023 07:42:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688136166; x=1690728166; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nu8s0PokcjkQ52Gkrw1IpnpH+FqERViYUyABgSUu/dE=; b=OMtzMHtvGM6XIsUhi+R1Jf6xS6NM+isKkWd0+EETQc148Y02gh5h1H/560DFRV1spn p1LJxIr/g4PtCccgjki3DxazRhaT3zZReDMImlSxdxALhZgHC6DbUO7x7oJEzf25yjMZ YGldbDcHLgE4CsPzpGfoBEivhu/u+q+C0x5qW6udI/jpz5ZkOkPuc2PW6ISdHOYWPKO0 2Z/Ur1ftIKNPQgb4fDXWmfQegXntWw4pSya2AjNT6/yxrGP+qOC/Rl6jLI9JBQblGjYH PUapNyvQLvl8JAZib3QZneFLPEXd541Y0Awz/uLAtfMPkl+ekejO+w5OGU+9og3TNhCD Uh3w== X-Gm-Message-State: AC+VfDx4Fdi50/X2//7ruNcmTfrkg5wUuvyIT3I6ThN77aVj6113/vvU BXev790W16wkpA1ECKOLgUtoT1TUKdABDr54KG+Tcg== X-Google-Smtp-Source: ACHHUZ4WM/AMppHlKVi9r8iUwuqOFmLMoN9WbUjy8It0O5RuTpKLZGjH7LRx3b9nHcHSTaSZeSvsZg== X-Received: by 2002:a7b:cc15:0:b0:3fb:abd0:2b52 with SMTP id f21-20020a7bcc15000000b003fbabd02b52mr2145803wmh.13.1688136165806; Fri, 30 Jun 2023 07:42:45 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id c14-20020a7bc84e000000b003f8126bcf34sm22075072wml.48.2023.06.30.07.42.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jun 2023 07:42:45 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 56f3f2d2491e - main - libsecureboot: avoid set but not used errors From: Jessica Clarke In-Reply-To: <202306300652.35U6qpgP027126@gitrepo.freebsd.org> Date: Fri, 30 Jun 2023 15:42:34 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <667C347E-B7C7-405B-AFEC-F0A0FD0656F6@freebsd.org> References: <202306300652.35U6qpgP027126@gitrepo.freebsd.org> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4Qsyj361Vjz43QW X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 30 Jun 2023, at 07:52, Simon J. Gerraty wrote: >=20 > The branch main has been updated by sjg: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D56f3f2d2491e30f369f9461c3cb2a366= bdffbe1d >=20 > commit 56f3f2d2491e30f369f9461c3cb2a366bdffbe1d > Author: Simon J. Gerraty > AuthorDate: 2023-06-30 06:52:17 +0000 > Commit: Simon J. Gerraty > CommitDate: 2023-06-30 06:52:17 +0000 >=20 > libsecureboot: avoid set but not used errors >=20 > Reviewed by: stevek > --- > lib/libsecureboot/openpgp/opgp_sig.c | 22 ++++++++++++---------- > lib/libsecureboot/vets.c | 7 +++++-- > 2 files changed, 17 insertions(+), 12 deletions(-) >=20 > diff --git a/lib/libsecureboot/openpgp/opgp_sig.c = b/lib/libsecureboot/openpgp/opgp_sig.c > index eec3469e3457..7f4e6fb98fd1 100644 > --- a/lib/libsecureboot/openpgp/opgp_sig.c > +++ b/lib/libsecureboot/openpgp/opgp_sig.c > @@ -464,20 +464,22 @@ verify_asc(const char *sigfile, int flags) > size_t n; > unsigned char *fdata, *sdata; > size_t fbytes, sbytes; > - =20 > + > + fdata =3D NULL; > if ((sdata =3D read_file(sigfile, &sbytes))) { > n =3D strlcpy(pbuf, sigfile, sizeof(pbuf)); > - if ((cp =3D strrchr(pbuf, '.'))) > - *cp =3D '\0'; > - if ((fdata =3D read_file(pbuf, &fbytes))) { > - if (openpgp_verify(pbuf, fdata, fbytes, sdata, > - sbytes, flags)) { > - free(fdata); > - fdata =3D NULL; > + if (n < sizeof(pbuf)) { > + if ((cp =3D strrchr(pbuf, '.'))) > + *cp =3D '\0'; > + if ((fdata =3D read_file(pbuf, &fbytes))) { > + if (openpgp_verify(pbuf, fdata, fbytes, sdata, > + sbytes, flags)) { > + free(fdata); > + fdata =3D NULL; > + } > } > } > - } else > - fdata =3D NULL; > + } > free(sdata); > return (fdata); > } > diff --git a/lib/libsecureboot/vets.c b/lib/libsecureboot/vets.c > index 4375dfa76a89..12191097ff8c 100644 > --- a/lib/libsecureboot/vets.c > +++ b/lib/libsecureboot/vets.c > @@ -241,11 +241,14 @@ x509_cn_get(br_x509_certificate *xc, char *buf, = size_t len) > mc.vtable->start_cert(&mc.vtable, xc->data_len); > mc.vtable->append(&mc.vtable, xc->data, xc->data_len); > mc.vtable->end_cert(&mc.vtable); > - /* we don' actually care about cert status - just its name */ > + /* we don't actually care about cert status - just its name */ > err =3D mc.vtable->end_chain(&mc.vtable); >=20 > - if (!cn.status) > + if (!cn.status) { > buf =3D NULL; > + if (err =3D=3D 0) /* keep compiler happy */ > + buf =3D NULL; This is nonsense code. Jess > + } > return (buf); > } >=20