From nobody Fri Apr 14 07:26:28 2023 X-Original-To: dev-commits-src-branches@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 4PySg85xM3z44g37; Fri, 14 Apr 2023 07:26:28 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PySg85WmNz3smT; Fri, 14 Apr 2023 07:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681457188; 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=/KWADaZrArPvXlJ9EkAD3FbZYAm2zE+VeTTZT+2d2Sc=; b=aTrIfOimC0mw4NZEy8FcrLIPOCbRkDJOg2UAX+DIl2QBD47RNrAyENbTOJ4zn2CP57F/Dg 3iQ7NYdCLIjseuYCVbQTOsPIOimUAVl8+4eEPhgfrEGU0cpaeV1gXpQ+piqaPwwG5S06qz vp4HlWVO0Py9hsU2Oz39ImhFOPIqWJpSs64p5erc5MaV0Owvtq6uvRw3OxIukUIlMs9ISx Pebvfyq8RTm7WWSrioVhJ7UFUj3Et32wy7b3qwzv6MIvuensqNGQXvbsfi3MkxU88ynv3h 1b4a6M6LJMdclwDPSBWY4aD6XIg4Bqz+0mQ0t1ws/GDwhOK537LtaSnmACYDLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681457188; 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=/KWADaZrArPvXlJ9EkAD3FbZYAm2zE+VeTTZT+2d2Sc=; b=FwEkA8il4lFE64RUq9YXXVsnfeA/IRG3M72sENyKiGxRiUCENAegTzMPXO+aRkxqTKnrYg gR3l6xXozWX1XlclnkS+jaa7Z9Nfv5pKhb+97I5wFenoX4SYIs7XhFhGOh+zpojWEmZrCB qrdIHMU7YBtPNqSohJdJ/DuEVD3JZjGiEpz6ejw7U89FVlDZXfzw6ZfRuGcQozy7bBli32 w8e4V26nBvvVACHXiDiCH365Av/XNft1KDAISLK7gNk6RuIynxF8OMnhYwz+i14TBCrwiR +2Z4ISCzV0FY6xDRGhdlAmO5rX/TWIU9/d9kaKtenFzPG4IToKZfutK1jpwgGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681457188; a=rsa-sha256; cv=none; b=df6owEPn8ljJFFnvk7KnxSgIHiDj/HOTRO1WiIQzcMs011jSuzY+DU7Bepw9MCVNQvxlaI aG7IxFPG/hsjBhs0MuokvrYG8lV+qYFBi5he5RXp55Az/uZDVDhvkve77luVgc/jbdizAA NPZpZTAmZVKQfDdH6lqRwz8dR3BjpOzhZSldr0XnRH5rZ3udPtVWtyK7hvIr6RMn+yDj+V VS03LWiuoFCVbHxgZ1ymAhcL7SEtWg8ngpE/3Ih94UbGT4FFk0n98SrlilpvJxUMThtf++ C26WhL4+tKnny1ZezB64gP/iTolecYHBKiN+dImprUEpSf2t95iUtZaUB/uhzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PySg84Tm0zFl9; Fri, 14 Apr 2023 07:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33E7QSIY032629; Fri, 14 Apr 2023 07:26:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33E7QSBB032628; Fri, 14 Apr 2023 07:26:28 GMT (envelope-from git) Date: Fri, 14 Apr 2023 07:26:28 GMT Message-Id: <202304140726.33E7QSBB032628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9c95cd930378 - stable/13 - libsecureboot: Do not propagate empty string List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9c95cd930378cf5014b0abdafd3cc6645bfabbc8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9c95cd930378cf5014b0abdafd3cc6645bfabbc8 commit 9c95cd930378cf5014b0abdafd3cc6645bfabbc8 Author: Wojciech Macek AuthorDate: 2022-06-29 08:50:23 +0000 Commit: Gordon Bergling CommitDate: 2023-04-14 07:25:05 +0000 libsecureboot: Do not propagate empty string If Trust Anchors are provided by UEFI and not compiled into libsecureboot the segmentation fault occurs due to empty or NULL string usage. Obtained from: Semihalf Reviewed by: sjg Differential revision: https://reviews.freebsd.org/D35120 (cherry picked from commit e6ef5042e485f74e7233a9974010b16a7316167e) --- lib/libsecureboot/vets.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libsecureboot/vets.c b/lib/libsecureboot/vets.c index dd347a0a8c13..af423b1cd7c0 100644 --- a/lib/libsecureboot/vets.c +++ b/lib/libsecureboot/vets.c @@ -420,8 +420,9 @@ ve_trust_init(void) #endif #ifdef TRUST_ANCHOR_STR - ve_trust_anchors_add_buf(__DECONST(unsigned char *, TRUST_ANCHOR_STR), - sizeof(TRUST_ANCHOR_STR)); + if (TRUST_ANCHOR_STR != NULL && strlen(TRUST_ANCHOR_STR) != 0ul) + ve_trust_anchors_add_buf(__DECONST(unsigned char *, + TRUST_ANCHOR_STR), sizeof(TRUST_ANCHOR_STR)); #endif once = (int) VEC_LEN(trust_anchors); #ifdef VE_OPENPGP_SUPPORT