From nobody Sun May 28 18:55:25 2023 X-Original-To: dev-commits-src-main@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 4QTnsp1V7zz4XlFl; Sun, 28 May 2023 18:55:26 +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 4QTnsp0s4sz3v1W; Sun, 28 May 2023 18:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685300126; 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=P/T4XRDY/CJmSTtWocJwUgBVr9QSOvr0iCYagKNYfYw=; b=s4EVwoR4IkvBA8uWd2FQL/7r3Hd7ABceS+c0McOR+w04lFb/v9fakpZZVrCm3moQZ/BQA6 jg7Oy7i9cnOE8xP+DjDvv0+KFC5UaQyPCgFH/pdl4stSDScGxSYWrPwiAtsc5o5GA6MNXO YF9YCjB6phlX1MWgAP0IMNxrO99DbgSTnOHIiAzM7w+u9SJYNjkKAzl4oUR6SkFx4CL5ps leC4hbCA7w+q7OfMYoBCt3ma9VEgShMOw6WzgljdqBYti5YhZUnox8wk/PVisSgxRCdsLJ awhEv3Pqv9+jSIoliPbnDZo8wi4mMmvIJQ8P2pLnWCKCfidxvHrH2a3hiJbvTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685300126; 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=P/T4XRDY/CJmSTtWocJwUgBVr9QSOvr0iCYagKNYfYw=; b=aySco+QqR8znSzn9SGifcgkXj5jGiszRyjDt8dp5ibFnqEhO5OG6wnUYx7vhmCG3u+fS8x BnYh73Y4BlwCXgkZNzFCFxBaCXSnHMqaKinEGrDBPWu/LYU2kJQgH0U0zexQq2NdkTkIXg DPA/yjZnS8/hlTzSIoYJwL1wE9c9ULaDVcfwch7AziTbQ6GpcxAYSXbfW/Md28yf/kUHJo aBmSzw8f0CI6Y6yktXZc7+sELI6/w8Cm5py6SJtutd/zfauScKB+BpIJmqMihSNpNRbx1j rgdacjz51NqfbA43ce3ZG/0WDxNhZI1QXGZXAi4adePbRuVw5Ru+sPVGYP+4uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685300126; a=rsa-sha256; cv=none; b=tw+uEOmSMHdW7iLW4JvBdMLauUPRXU00B8SNMeuOnxCtvkxRd6xgQqF/GFu3cFGwOV/Qwo 7Kj82JImwP0W5GDOnGv6IctX6p5q5XItjsDXsKX0AaNy0iUJsIUgse2jLvDxWBeq3N+8Tm XGbBlfL90W/vZR6VOkaTip6m7kcQmaCSjwl0ebDwysS64+NJwFrPrq5hVlPcl6iyrqmI6y 9XsCjyThtz5PNugAIb6FHp6eu3xueWJU7/bepq4vKpBHifAw1aW9DZVdRdRVFhRwppJ6jk eqZXK5eGMxHmxiC612zsuoGL5FAZIqnIafLA96KMjXFemMaZ6umy6qdLW9BpAA== 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 4QTnsn72Tbzh29; Sun, 28 May 2023 18:55:25 +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 34SItPrO046423; Sun, 28 May 2023 18:55:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SItPA6046422; Sun, 28 May 2023 18:55:25 GMT (envelope-from git) Date: Sun, 28 May 2023 18:55:25 GMT Message-Id: <202305281855.34SItPA6046422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 9ed4ec4ae34a - main - stand: libefi: avoid a null pointer deref in eficom List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ed4ec4ae34a9ecab0471f1dbf392729155d7411 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9ed4ec4ae34a9ecab0471f1dbf392729155d7411 commit 9ed4ec4ae34a9ecab0471f1dbf392729155d7411 Author: Kyle Evans AuthorDate: 2023-05-28 18:50:46 +0000 Commit: Kyle Evans CommitDate: 2023-05-28 18:54:50 +0000 stand: libefi: avoid a null pointer deref in eficom We don't keep comc_port around anymore if the console's not present, but some things might still try to set one of the environment variables we hook. In particular, one need not even set efi_com_port/efi_com_speed in loader.conf; loader may do it itself and induce the crash if ConOut depicts an available uart. Probably reported by: dch OK for now: imp --- stand/efi/libefi/eficom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c index 4c104114d445..f5969cc5d42a 100644 --- a/stand/efi/libefi/eficom.c +++ b/stand/efi/libefi/eficom.c @@ -497,7 +497,7 @@ comc_port_set(struct env_var *ev, int flags, const void *value) EFI_HANDLE handle; EFI_STATUS status; - if (value == NULL) + if (value == NULL || comc_port == NULL) return (CMD_ERROR); if (comc_parse_intval(value, &port) != CMD_OK) @@ -532,7 +532,7 @@ comc_speed_set(struct env_var *ev, int flags, const void *value) { unsigned speed; - if (value == NULL) + if (value == NULL || comc_port == NULL) return (CMD_ERROR); if (comc_parse_intval(value, &speed) != CMD_OK)