From nobody Thu Nov 28 12:51:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1670947543; cv=none; d=zohomail.com; s=zohoarc; b=O3pap2ssqMH3V/HJXT9873H8n5YzvjiGL9VlHU0BxRbW0ApdbSmwKWYnZ1ud7W4ph/IPKUwBXe/GYG8J+hg7ocQgji+vv9CK4YO7QHUN3xL/IsCNOQqm04/VWgjr+TIUsDtuPB2eqz+koyfqRijB5fA/K/DzHTZW6iNninnSVZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670947543; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Rd5kqjg8Itv+7WroyptP0xdbZofMNnnXVQRH2ymCEfM=; b=g2HS9DK36UbnrLdrtdrpUHEAOKKnznLcwpjl9pMY3muL5LBdmZ3+gpBZTlQ9BvmwF0g7DWE3LUQMzwvDlXujyWjT5+AtnONmCfAxB3K/1yb7N7IU6rGzx+yWe4FhPNyRXDR+FrCO9lEaPsssRa7pknLswo++WaKPGAO6WZprokQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1670947543871735.4152277774809; Tue, 13 Dec 2022 08:05:43 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.460763.718768 (Exim 4.92) (envelope-from ) id 1p57mC-0005fT-Qk; Tue, 13 Dec 2022 16:05:04 +0000 Received: by outflank-mailman (output) from mailman id 460763.718768; Tue, 13 Dec 2022 16:05:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p57mC-0005cr-KI; Tue, 13 Dec 2022 16:05:04 +0000 Received: by outflank-mailman (input) for mailman id 460763; Tue, 13 Dec 2022 16:05:03 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p57jF-0001dt-I4 for xen-devel@lists.xenproject.org; Tue, 13 Dec 2022 16:02:01 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [2001:67c:2178:6::1c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 7a4a002e-7aff-11ed-91b6-6bf2151ebd3b; Tue, 13 Dec 2022 17:02:00 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 78BAD22A30; Tue, 13 Dec 2022 16:02:00 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 4B466138EE; Tue, 13 Dec 2022 16:02:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id SJ8yEfihmGMPKgAAMHmgww (envelope-from ); Tue, 13 Dec 2022 16:02:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 7a4a002e-7aff-11ed-91b6-6bf2151ebd3b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1670947320; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Rd5kqjg8Itv+7WroyptP0xdbZofMNnnXVQRH2ymCEfM=; b=Jmj3sJeVLWVsnC89d6KmWFd/Vbx7iMv7tEjxtIjdVlQMPir7YAzzJQkVRGCdenNiVdxat7 brDyHtW27NPJZyPB6btr5xu8ThyO5kTbvwNygKCMg749mkY6QlUZRN5Dtn9tbZqdaTFqKc JKNd3G1rODkLctwVBBA757OkO2RgBoo= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD , Julien Grall Subject: [PATCH v2 13/19] tools/xenstore: make domain_is_unprivileged() an inline function Date: Tue, 13 Dec 2022 17:00:39 +0100 Message-Id: <20221213160045.28170-14-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221213160045.28170-1-jgross@suse.com> References: <20221213160045.28170-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1670947545304100001 Content-Type: text/plain; charset="utf-8" clang 14 is complaining about a NULL dereference for constructs like: domain_is_unprivileged(conn) ? conn->in : NULL as it can't know that domain_is_unprivileged(conn) will return false if conn is NULL. Fix that by making domain_is_unprivileged() an inline function (and related to that domid_is_unprivileged(), too). In order not having to make struct domain public, use conn->id instead of conn->domain->domid for the test. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_core.h | 10 ++++++++++ tools/xenstore/xenstored_domain.c | 11 ----------- tools/xenstore/xenstored_domain.h | 2 -- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_cor= e.h index 37006d508d..3c4e27d0dd 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -297,6 +297,16 @@ void unmap_xenbus(void *interface); =20 static inline int xenbus_master_domid(void) { return dom0_domid; } =20 +static inline bool domid_is_unprivileged(unsigned int domid) +{ + return domid !=3D dom0_domid && domid !=3D priv_domid; +} + +static inline bool domain_is_unprivileged(const struct connection *conn) +{ + return conn && domid_is_unprivileged(conn->id); +} + /* Return the event channel used by xenbus. */ evtchn_port_t xenbus_evtchn(void); =20 diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_d= omain.c index 1e9d7545b7..a3ecdb382f 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -406,17 +406,6 @@ void handle_event(void) barf_perror("Failed to write to event fd"); } =20 -static bool domid_is_unprivileged(unsigned int domid) -{ - return domid !=3D dom0_domid && domid !=3D priv_domid; -} - -bool domain_is_unprivileged(struct connection *conn) -{ - return conn && conn->domain && - domid_is_unprivileged(conn->domain->domid); -} - static char *talloc_domain_path(const void *context, unsigned int domid) { return talloc_asprintf(context, "/local/domain/%u", domid); diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_d= omain.h index 1e402f2609..22996e2576 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -59,8 +59,6 @@ void ignore_connection(struct connection *conn, unsigned = int err); /* Returns the implicit path of a connection (only domains have this) */ const char *get_implicit_path(const struct connection *conn); =20 -bool domain_is_unprivileged(struct connection *conn); - /* Remove node permissions for no longer existing domains. */ int domain_adjust_node_perms(struct node *node); int domain_alloc_permrefs(struct node_perms *perms); --=20 2.35.3