From nobody Wed Jul 20 23:03:26 2022 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 4LpB7y72XGz4XBWL; Wed, 20 Jul 2022 23:03: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 4LpB7y6S8Tz3mkp; Wed, 20 Jul 2022 23:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658358206; 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=4Cf8E5wqKm05UtqF55X4KVLCCrsrM/6l9ZavAJyfVBY=; b=ipYjKXm0OOWmd8kS7ZYF2/CvEq4slaBKZYKZlj6c8FNNNdZV+gE7BO9Smm93TrroUrqLap Lw3NqV+usWL5z54luqztgqQt2ljiAAyxoD+fnn+IWJjz0gtPLba5WpuhamLYy+nmJmMIz2 rC/iXbaU7kjwGpb6voDIJkMAOLx4TK7LdnVryAr+UdfrbWKE9Nlc18fo7W1sLvcGaaM/tl IbZMM55NIbMlESiR3XLWyD/rkytBd4nHBYgqYmFXViDR6vFcAulrjDLQZEfefW8yGt4oPa Rjc1JOiN/YWyofoHoEbjJYdgS8KuWiAZb1NgAUUsUiT8iCTGNeWFGo9T4h+a1w== 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 4LpB7y5TQMz1FPs; Wed, 20 Jul 2022 23:03:26 +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 26KN3Q7P013123; Wed, 20 Jul 2022 23:03:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26KN3QW4013122; Wed, 20 Jul 2022 23:03:26 GMT (envelope-from git) Date: Wed, 20 Jul 2022 23:03:26 GMT Message-Id: <202207202303.26KN3QW4013122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b43b8f81578c - main - mac_ddb: Only include the vnet validator in VIMAGE kernels. 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b43b8f81578cbb7bddbd6f7b8ebe06a219c88140 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658358206; 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=4Cf8E5wqKm05UtqF55X4KVLCCrsrM/6l9ZavAJyfVBY=; b=MP12Qhhemcy4paqXapRiUh79ri7zm8UW5xspL+dT0TDzTEw67YJTYZaNwg+qCISxyIHPWV kDNDqg6svFMCEKV7oRrQFAz+uE9XmOmVa0ZEMDYEHD+IxTxPvsWTQHIETXcvZq0wsHI9MI I9FPCd9rp+Js8uLq2KIK3Cb0TfHQ6x25nLYeSazjPEePM1FBZ+8IQOgHREGGOh3VJbDK0I 3LHv9PtzmSHKoTxebC1K8i5kiqRk8IMhDClXsgqKo/fHGD/wQ3/HX1m0bSQMl2aG+TBtjS CCvEmwKJWfWBlz8HQ9OJrMQKWKO3Q1BRM9QB9QVIkl0FizrafdFkE1an+u3mXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658358206; a=rsa-sha256; cv=none; b=AhYYxnj4yV4ENiKBUFJv8UCSYM5pdIYld9rKKcGfDUlYxIwPvWEWd2iPKEwej3UQoIHhEL JRpEdRhq7hPAIZLHVUeX/d7n76aUYPuAE2BC2oUfixeov6UZCHlZ0V7BMJTV8Az07QnHLz FBosMS7i4g9oNUg2AAzYsJ49GtwuTvuVhn/2N0eMdXQ0Kn41pwQN+IrkOxiQd1JnItAZ7U Wv9vPgfqpRCKOUVpXMx4/0qCvVoKnI92bd/QuBJ8pQYoVq50tGDSgqWqFjiF+z7vWtNJa0 w+8/KcXDY5EXDqnm4h2toIs21CKl+Fz1oI+en16GMBFM56g5EFYMzSlVIYvQxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b43b8f81578cbb7bddbd6f7b8ebe06a219c88140 commit b43b8f81578cbb7bddbd6f7b8ebe06a219c88140 Author: John Baldwin AuthorDate: 2022-07-20 23:02:56 +0000 Commit: John Baldwin CommitDate: 2022-07-20 23:02:56 +0000 mac_ddb: Only include the vnet validator in VIMAGE kernels. This fixes the build of at least i386 MINIMAL which was failing with the error: sys/security/mac_ddb/mac_ddb.c:200:15: error: use of undeclared identifier 'vnet'; did you mean 'int'? if ((void *)vnet == (void *)addr) ^~~~ int Sponsored by: DARPA --- sys/security/mac_ddb/mac_ddb.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/security/mac_ddb/mac_ddb.c b/sys/security/mac_ddb/mac_ddb.c index 89cba3145945..847be4997226 100644 --- a/sys/security/mac_ddb/mac_ddb.c +++ b/sys/security/mac_ddb/mac_ddb.c @@ -77,7 +77,9 @@ static db_validation_fn_t db_show_ffs_valid; static db_validation_fn_t db_show_prison_valid; static db_validation_fn_t db_show_proc_valid; static db_validation_fn_t db_show_rman_valid; +#ifdef VIMAGE static db_validation_fn_t db_show_vnet_valid; +#endif struct cmd_list_item { const char *name; @@ -96,7 +98,9 @@ static const struct cmd_list_item show_command_list[] = { { "proc", db_show_proc_valid }, { "rman", db_show_rman_valid }, { "thread", db_thread_valid }, +#ifdef VIMAGE { "vnet", db_show_vnet_valid }, +#endif }; static int @@ -188,6 +192,7 @@ db_show_rman_valid(db_expr_t addr, bool have_addr, db_expr_t count, char *modif) return (EACCES); } +#ifdef VIMAGE static int db_show_vnet_valid(db_expr_t addr, bool have_addr, db_expr_t count, char *modif) { @@ -203,6 +208,7 @@ db_show_vnet_valid(db_expr_t addr, bool have_addr, db_expr_t count, char *modif) return (EACCES); } +#endif static int command_match(struct db_command *cmd, struct cmd_list_item item)