From nobody Wed May 8 17:18:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605703857; cv=none; d=zohomail.com; s=zohoarc; b=UZ+uJmJJdj/d09c3SDI2nJ6CdQ2d7as4grsoV2C94fwBBuJJ+a3E4x2lBMoaXcRAtiGPbUBXySL3cvfMrTCILzc+xwslv2b+23VGoJLng4F3A0mHNz//NL5Jsez031TmN33uHIk+zkSYVM+rVwcQMHoR5dxs4B6QL/329Yml7Lk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605703857; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tfOO1kwUE2+NuqnaiEKk53P06+P0811o9aM9Ih4Rchc=; b=NBkbkl7K+7rTAcddaXS+J6P4MHrAnb9dNeqOtIiXz1ykLbWB5+hUwnwgpBtRM/vGIncQjZQ0Z3uTgKqvE5CluD5a9GoDMjfaKTy2MU/RSGIhV9+zzwDMuufwuleETMU/fONhyHCoSJ95XiVsdbG2Hgz+Ywv3GFO2AFuahUhY12U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605703857352238.11172433482318; Wed, 18 Nov 2020 04:50:57 -0800 (PST) Received: from localhost ([::1]:37178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfMvE-0007DO-88 for importer@patchew.org; Wed, 18 Nov 2020 07:50:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfMtm-0005u9-Hc for qemu-devel@nongnu.org; Wed, 18 Nov 2020 07:49:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfMtk-0006PE-QQ for qemu-devel@nongnu.org; Wed, 18 Nov 2020 07:49:22 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-511-0IXs15ZJNQGa7R9rp9wYpQ-1; Wed, 18 Nov 2020 07:49:18 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6AB5D1009459 for ; Wed, 18 Nov 2020 12:49:17 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-41.ams2.redhat.com [10.36.115.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4B015D9CA; Wed, 18 Nov 2020 12:49:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605703759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tfOO1kwUE2+NuqnaiEKk53P06+P0811o9aM9Ih4Rchc=; b=I6d0tOW7OMoNnG4szoNrN1pLEfc2kA75RVSIbJ5dsaMr2WmCilh6SnVxCMl3ohZbXWtb8W iKGRqTP3Vm1CpgzSD5NrjnyVTb1dxwEmVa82IEFpp87j+RtpWFFsYtlMuViwxwGqUXtZA4 xsJMNfdZAXreGUx5PSvk/w0wXW76WuU= X-MC-Unique: 0IXs15ZJNQGa7R9rp9wYpQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 1/4] authz-list-file: Fix file read error handling Date: Wed, 18 Nov 2020 12:49:08 +0000 Message-Id: <20201118124911.282735-2-berrange@redhat.com> In-Reply-To: <20201118124911.282735-1-berrange@redhat.com> References: <20201118124911.282735-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 00:38:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Markus Armbruster The Error ** argument must be NULL, &error_abort, &error_fatal, or a pointer to a variable containing NULL. Passing an argument of the latter kind twice without clearing it in between is wrong: if the first call sets an error, it no longer points to NULL for the second call. qauthz_list_file_complete() is wrong that way: it passes @errp to qauthz_list_file_complete() without checking for failure. If it runs into another failure, it trips error_setv()'s assertion. Reproducer: $ qemu-system-x86_64 -nodefaults -S -display none -object authz-list-fi= le,id=3Dauthz0,filename=3D qemu-system-x86_64: ../util/error.c:59: error_setv: Assertion `*errp = =3D=3D NULL' failed. Aborted (core dumped) Fix it to check for failure. Fixes: 55d869846de802a16af1a50584c51737bd664387 Signed-off-by: Markus Armbruster Signed-off-by: Daniel P. Berrang=C3=A9 --- authz/listfile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/authz/listfile.c b/authz/listfile.c index 24feac35ab..1421e674a4 100644 --- a/authz/listfile.c +++ b/authz/listfile.c @@ -128,6 +128,9 @@ qauthz_list_file_complete(UserCreatable *uc, Error **er= rp) } =20 fauthz->list =3D qauthz_list_file_load(fauthz, errp); + if (!fauthz->list) { + return; + } =20 if (!fauthz->refresh) { return; --=20 2.28.0 From nobody Wed May 8 17:18:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605703953; cv=none; d=zohomail.com; s=zohoarc; b=kAVmnmkxmo62SdJJ5JBWtfekjUVNfrzSaGC0hPvZclYtT0w0KM/1y2maKZjtVWVkcqx9BA+G9gc3mcNYLwQsKaotJLeVEWS3j9wAcnQWA4acDM+23ktbTgbzdzvIxZvmGJDn4Zso1M+EkNBA9Ymyf6x9YylcqES+kEgbifBVihc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605703953; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LWJIrOy8ou91p1PKbSyJTaHwZsG5E7Lz+BQA2fs9ye8=; b=TCETeoNGiQW08OcyblcMIFDiWSFTQhHGVUmguYKLl4piDzx+KiI4IqdK8uQJrEbjPnJbO5+S69r/FX9/oGkS4ocWX+CJcLvzqx3K72txsBsn7BIypaLE2oEK8hVFpLOfDivIMWiMQTPPctsh60tOTaVAcdvxWK5scqjvDEa7/7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605703953917332.8336377468222; Wed, 18 Nov 2020 04:52:33 -0800 (PST) Received: from localhost ([::1]:41704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfMwq-0000iW-Q0 for importer@patchew.org; Wed, 18 Nov 2020 07:52:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfMtn-0005wn-Ub for qemu-devel@nongnu.org; Wed, 18 Nov 2020 07:49:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23057) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfMtm-0006PN-8L for qemu-devel@nongnu.org; Wed, 18 Nov 2020 07:49:23 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-507-LttGLwYXMqyGyRQbSuC7KQ-1; Wed, 18 Nov 2020 07:49:19 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA0D31084C92 for ; Wed, 18 Nov 2020 12:49:18 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-41.ams2.redhat.com [10.36.115.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id BAD255D9CA; Wed, 18 Nov 2020 12:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605703761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LWJIrOy8ou91p1PKbSyJTaHwZsG5E7Lz+BQA2fs9ye8=; b=bXstNPY4xOFRH+SnWt5Z8z8UKKeuWU5awfTpOtQajr0Bfai02z8SInD/Qaq2EPRHvekBTg 6Ls5zlRvyTzDcuGRHmMig8wYbDvcwFxwc6fWfzdldASqW+YSFKy7+L4eW/QapH5AhHtSwQ F3pQsVrQSPQIaG4pzFvTqHMpxg3t19s= X-MC-Unique: LttGLwYXMqyGyRQbSuC7KQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 2/4] authz-list-file: Improve an error message Date: Wed, 18 Nov 2020 12:49:09 +0000 Message-Id: <20201118124911.282735-3-berrange@redhat.com> In-Reply-To: <20201118124911.282735-1-berrange@redhat.com> References: <20201118124911.282735-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 00:38:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Markus Armbruster When qauthz_list_file_load() rejects JSON values other than JSON object with a rather confusing error message: $ echo 1 | qemu-system-x86_64 -nodefaults -S -display none -object aut= hz-list-file,id=3Dauthz0,filename=3D/dev/stdin qemu-system-x86_64: -object authz-list-file,id=3Dauthz0,filename=3D/dev= /stdin: Invalid parameter type for 'obj', expected: dict Improve to qemu-system-x86_64: -object authz-list-file,id=3Dauthz0,filename=3D/dev= /stdin: File '/dev/stdin' must contain a JSON object Signed-off-by: Markus Armbruster Signed-off-by: Daniel P. Berrang=C3=A9 --- authz/listfile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/authz/listfile.c b/authz/listfile.c index 1421e674a4..da3a0e69a2 100644 --- a/authz/listfile.c +++ b/authz/listfile.c @@ -73,7 +73,8 @@ qauthz_list_file_load(QAuthZListFile *fauthz, Error **err= p) =20 pdict =3D qobject_to(QDict, obj); if (!pdict) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, "obj", "dict"); + error_setg(errp, "File '%s' must contain a JSON object", + fauthz->filename); goto cleanup; } =20 --=20 2.28.0 From nobody Wed May 8 17:18:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605703987; cv=none; d=zohomail.com; s=zohoarc; b=fvpMqVPnGIffIHkNtm35mbsDIJ8vSd+89tEVIAjy4xqQQ5WJdBQijt4Pxz/cWvjAdlpn0uCFFsnVduuGdo1jtGMNuq9Nbnqx/toqE5m6zhZduKXg8P/BAcqpuHZ0NBhAN5t20HIcEDTM9Wds/1VJ2K1gm+u/z2GbyFWyoNzJxKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605703987; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QgGQttnHeh+zDfd8ZBUlXW36Kmz2AWJVHsTXkjoZkoc=; b=aD6Mxmb4BUYbc+ncDoEsgG30/e2KA70tyJMW2+x7mvsW+ktZ2Dmhw1hvca8+fkvkQb8Ty3uBbc6qHU9BCa60D+ufCZS0Z+JYNEZKJLe27EwMaD/g65AUAJtEL3qz5hGJ39/u5E2gjiH2cythI9Qy4bI4hE41lpYfecOpkItEbSU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605703987624460.5323655371491; Wed, 18 Nov 2020 04:53:07 -0800 (PST) Received: from localhost ([::1]:42642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfMxO-00018D-Jj for importer@patchew.org; Wed, 18 Nov 2020 07:53:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfMtp-0005zq-Bm for qemu-devel@nongnu.org; Wed, 18 Nov 2020 07:49:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32537) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfMtn-0006Pc-Jo for qemu-devel@nongnu.org; Wed, 18 Nov 2020 07:49:24 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-261-7Vo8GhYKOOiLLWu8FAJnJg-1; Wed, 18 Nov 2020 07:49:21 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 31B9F6D249 for ; Wed, 18 Nov 2020 12:49:20 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-41.ams2.redhat.com [10.36.115.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25B645D9CA; Wed, 18 Nov 2020 12:49:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605703762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QgGQttnHeh+zDfd8ZBUlXW36Kmz2AWJVHsTXkjoZkoc=; b=hKCzXgXCNNsRVk7nxnWAyCUIRn2SueHnSTBFG4bV+xXV4GVyoUdx8mbSdsn15uEtUMFsjO tCvGZiW0BYJjjXs8KWQnqPfDSgnLBdTClBHcUTtV2daiBcnH1sDCVZqUQdTT8mzOMJJxFa CxYANBl2NZmuETPAX55j5bOW6OTBXNg= X-MC-Unique: 7Vo8GhYKOOiLLWu8FAJnJg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 3/4] authz-pam: Check that 'service' property is set Date: Wed, 18 Nov 2020 12:49:10 +0000 Message-Id: <20201118124911.282735-4-berrange@redhat.com> In-Reply-To: <20201118124911.282735-1-berrange@redhat.com> References: <20201118124911.282735-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 00:38:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Kevin Wolf If the 'service' property is not set, we'll call pam_start() with a NULL pointer for the service name. This fails and leaves a message like this in the syslog: qemu-storage-daemon[294015]: PAM pam_start: invalid argument: service =3D= =3D NULL Make specifying the property mandatory and catch the error already during the creation of the object. Signed-off-by: Kevin Wolf Signed-off-by: Daniel P. Berrang=C3=A9 --- authz/pamacct.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/authz/pamacct.c b/authz/pamacct.c index e67195f7be..c862d9ff39 100644 --- a/authz/pamacct.c +++ b/authz/pamacct.c @@ -84,6 +84,12 @@ qauthz_pam_prop_get_service(Object *obj, static void qauthz_pam_complete(UserCreatable *uc, Error **errp) { + QAuthZPAM *pauthz =3D QAUTHZ_PAM(uc); + + if (!pauthz->service) { + error_setg(errp, "The 'service' property must be set"); + return; + } } =20 =20 --=20 2.28.0 From nobody Wed May 8 17:18:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605704126; cv=none; d=zohomail.com; s=zohoarc; b=QfOHTsKzhCr+tmeb2d5fNzq74vUfb56nSy0YVrXvPpzv9dW0AYXP1f0VDdcAIdAjoRZaKXhSQ5gFmsc5XXbtLxSt3tKGacP3PIfLDdBTqCSW0lsfpIfknQgWW/v/U9EC0rnncmVinw/Ry3wAlPY6nbwq/lnH834JrzhN4ILUqqE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605704126; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2gUp8g/cOUKKMEPSNl15ZcUZmBxcZOwmc5q+hl3FHd4=; b=I0nGQeQP7qFVksZ10wuWaxoTSqrgkkQRpCEn9YQw7GNydJtjdt0GDZoZTvqVc4SxirMYQyVLTiluUiKzmW4A/cn5ryclh89ODLJmtl1qim9/gbn1V6co3AwPZZXrfvgguN6To5TRg6LY4AsgIK+VjV+qQMGuZbVWut0Lf/lRDXM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605704126147724.6518415368851; Wed, 18 Nov 2020 04:55:26 -0800 (PST) Received: from localhost ([::1]:46970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfMzc-0002z8-Vb for importer@patchew.org; Wed, 18 Nov 2020 07:55:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfMts-00067A-Tu for qemu-devel@nongnu.org; Wed, 18 Nov 2020 07:49:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfMtr-0006Pu-9E for qemu-devel@nongnu.org; Wed, 18 Nov 2020 07:49:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-483-u7BFhMCdPtCRzDl1Ms0_qQ-1; Wed, 18 Nov 2020 07:49:24 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F15346D24E for ; Wed, 18 Nov 2020 12:49:23 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-41.ams2.redhat.com [10.36.115.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 991A45D9CD; Wed, 18 Nov 2020 12:49:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605703766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2gUp8g/cOUKKMEPSNl15ZcUZmBxcZOwmc5q+hl3FHd4=; b=FTlxDbfu+HSPIhzjEz44X9OFbfLMRR95/JcdCMNqpt86c9qZAVgukEp7w8A0dRnmmwnWpN wIHzzK/VKj7dlitMd96YdJHSyV941cTTXEfIqR7d0rgcLGkDoZniHAzLTi+QqqWa9+YXxC ndjngrASFSlNkylOPl7Lk0QL8uxMQGI= X-MC-Unique: u7BFhMCdPtCRzDl1Ms0_qQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 4/4] authz-simple: Check that 'identity' property is set Date: Wed, 18 Nov 2020 12:49:11 +0000 Message-Id: <20201118124911.282735-5-berrange@redhat.com> In-Reply-To: <20201118124911.282735-1-berrange@redhat.com> References: <20201118124911.282735-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 00:38:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Kevin Wolf If the 'identify' property is not set, we'll pass a NULL pointer to g_str_equal() and crash. Catch the error condition during the creation of the object. Signed-off-by: Kevin Wolf Signed-off-by: Daniel P. Berrang=C3=A9 --- authz/simple.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/authz/simple.c b/authz/simple.c index 18db0355f4..0597dcd8ea 100644 --- a/authz/simple.c +++ b/authz/simple.c @@ -65,11 +65,25 @@ qauthz_simple_finalize(Object *obj) } =20 =20 +static void +qauthz_simple_complete(UserCreatable *uc, Error **errp) +{ + QAuthZSimple *sauthz =3D QAUTHZ_SIMPLE(uc); + + if (!sauthz->identity) { + error_setg(errp, "The 'identity' property must be set"); + return; + } +} + + static void qauthz_simple_class_init(ObjectClass *oc, void *data) { QAuthZClass *authz =3D QAUTHZ_CLASS(oc); + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); =20 + ucc->complete =3D qauthz_simple_complete; authz->is_allowed =3D qauthz_simple_is_allowed; =20 object_class_property_add_str(oc, "identity", --=20 2.28.0