From nobody Thu Jul 21 14:01:09 2022 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 4LpZ3n4lZ8z4Wj4h; Thu, 21 Jul 2022 14:01:09 +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 4LpZ3n4HWZz42K5; Thu, 21 Jul 2022 14:01:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658412069; 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=1nwvxqgee11hQeEm0PRTIrCUiFvGh2EB6duLKzLjdT0=; b=vkqZZs08hyAWRCg7lsdaohJGViW5qE/AK08zd5VtTmKI6L/ZOzkHpQuAvPgbmLwc1JL4wc bVkjJdqZ265xq37G35In7mEiD+Tmi5jtFvlHGy/3Y+5SRBH/kyQ+mOYZNqJMViy2V8ytTP TBUd1a7nv+s7OQmhGHneo7doI4tpoEbotRFZa5dBbjHkp7lGq1++wq79+JAurMcDJ71weI UcVAB/8x811veAT2xmLKdBXa3j/5KLv5ssOsKqESujI/SUK3mUKtzABl/2Hoq4yinr1Teu mLT3ia6Rd992eRn25wa8cAnSRrefWgmdU2cPmsZ+xWbQvhI/Qq1L30coqVR2KQ== 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 4LpZ3n3MWGzPb5; Thu, 21 Jul 2022 14:01:09 +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 26LE19Xq028183; Thu, 21 Jul 2022 14:01:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26LE196o028182; Thu, 21 Jul 2022 14:01:09 GMT (envelope-from git) Date: Thu, 21 Jul 2022 14:01:09 GMT Message-Id: <202207211401.26LE196o028182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Allan Jude Subject: git: 3810b3790322 - main - mac_ddb: Make db_show_vnet_valid() handle !VIMAGE 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: allanjude X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3810b37903220af1a369d3c4032ae25fb2d7949d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658412069; 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=1nwvxqgee11hQeEm0PRTIrCUiFvGh2EB6duLKzLjdT0=; b=jlbgNKdHR4UA1F4uDSl4+oVJDJsw01xiu8qE3RlNgTaFjBhlcvsf5IPEx54hMn6eA+Ouvt jmSElX82kIcNUcX3W9SmawqZbRj6ewJKWRNhuVjgoIG6AbVDzw6ySVWukYNTB6abDU7FRn Pbmrr31ftmNzrRB5aPE9Z+Wj2QMtaBmn3oVYY+sz5uT/E/5PxWHdQHXI78BPN/fY4JdnVM bKfGVr9KoIBdXytquccfTJWUP2qFdPPzGTsJwQ3GqGtDJ0Q9r7SUlfo46n7j0N5AZSdzOb f5aykPQbAkYsWdRZZtuCdMsJdjQL+NmdApId+Yh/igBOrwJZiy9snVNb9G8BDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658412069; a=rsa-sha256; cv=none; b=TDw5G7pGgb6TKVO0jnGmpJvj3eKM6H/elTrgevk0xLCf7RlIZw8OXDP8kc3VJp3FFKCY4a JnpxyFhUnvnY0ZAh+JwnoC/4A+cwp4fHYa9cx2Bo9dUqIEIZVF/nHaVlQj77MG+0sHxab1 A4k+07QqFVKPLs53n+ptmE1YpEgTbLJD+Ck53eQ7kv3pnlHdUSqgmdXJA6jZWXNfvmDNbo MwAr2U3qfMOpd9XJ7GaHlRxjvcYY1WbTM2vMC95YcU7h2UtCnEL1y5crkY03B4LLz+Zy1W vfjxJuiWA+oBDrtCUBOqdwH5wAXbKQdHPy7wrJ3mWQNoW4+1RBvYeDZ5W9RoGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by allanjude: URL: https://cgit.FreeBSD.org/src/commit/?id=3810b37903220af1a369d3c4032ae25fb2d7949d commit 3810b37903220af1a369d3c4032ae25fb2d7949d Author: Allan Jude AuthorDate: 2022-07-21 13:58:05 +0000 Commit: Allan Jude CommitDate: 2022-07-21 14:01:01 +0000 mac_ddb: Make db_show_vnet_valid() handle !VIMAGE Reported by: kib Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. --- sys/security/mac_ddb/mac_ddb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/security/mac_ddb/mac_ddb.c b/sys/security/mac_ddb/mac_ddb.c index 847be4997226..8f2f0d78bb07 100644 --- a/sys/security/mac_ddb/mac_ddb.c +++ b/sys/security/mac_ddb/mac_ddb.c @@ -196,6 +196,7 @@ db_show_rman_valid(db_expr_t addr, bool have_addr, db_expr_t count, char *modif) static int db_show_vnet_valid(db_expr_t addr, bool have_addr, db_expr_t count, char *modif) { +#ifdef VIMAGE VNET_ITERATOR_DECL(vnet); if (!have_addr) @@ -207,6 +208,9 @@ db_show_vnet_valid(db_expr_t addr, bool have_addr, db_expr_t count, char *modif) } return (EACCES); +#else + return (EOPNOTSUPP); +#endif } #endif