From nobody Wed May 1 22:32:40 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=1605630840; cv=none; d=zohomail.com; s=zohoarc; b=CVy4B04FmDVkgUdHqjrLbPwAkaBUIwIViJ+ERzeWGXcHOAJRBi91uf5pZFPtNmYkGQVLSliBkCG7EHE8LwKzyfLuJa87UPBuHapAtkzQF+H1QSv1jZ6/L8QuN5RLnO56PUV7ECi2RxQCxPtNvQ/WvKhZXgrFVBS9R5xmKS/m10Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605630840; 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=unzN6rySqxtmhwhd1tTsQM5A9gtBf+0ddoIIzskmeOY=; b=cHP+kRY7bWtjWmW5s63VxkhZutK7te/XBVR8oSw6zYFg4DuwBrdM+PMCzkSNtKq4dJXjs+Sd8LvncY5dSfZIlchLZT3EiDvZ/956eyHzUAWn5jNzj4i4ou2lLThA3UbTD0Km9blS+YDRMyHBCCQFNKyz2aF7BpYxKpZGEeUQORU= 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 1605630840169431.66905513225095; Tue, 17 Nov 2020 08:34:00 -0800 (PST) Received: from localhost ([::1]:39130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf3vb-0004UP-4E for importer@patchew.org; Tue, 17 Nov 2020 11:33:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf3sp-0001uK-41 for qemu-devel@nongnu.org; Tue, 17 Nov 2020 11:31:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kf3sn-0007rk-3w for qemu-devel@nongnu.org; Tue, 17 Nov 2020 11:31:06 -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-11-FIRAZ1LmMpGwmH76IDy72g-1; Tue, 17 Nov 2020 11:31:00 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7BB575F9E6 for ; Tue, 17 Nov 2020 16:30:59 +0000 (UTC) Received: from merkur.redhat.com (ovpn-114-113.ams2.redhat.com [10.36.114.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C7C66BF6B; Tue, 17 Nov 2020 16:30:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605630664; 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=unzN6rySqxtmhwhd1tTsQM5A9gtBf+0ddoIIzskmeOY=; b=XvLxqeXLGtRy6T11G8tmefq0+U8eqRynX0m3NKjzyXtMZVLBS4OBshUsMgt7HT/0azF7zM oW0uAvPeU8mr2EmBYz/zKyLZWnYu1seYb5SFzyrcK1fQkBM+tj471WEtajlNLSYnS6Ogs2 UApyp5KFbDQUdtKnzQe/QDS4Qy3oXvU= X-MC-Unique: FIRAZ1LmMpGwmH76IDy72g-1 From: Kevin Wolf To: qemu-devel@nongnu.org Subject: [PATCH for-5.2? 1/2] authz-pam: Check that 'service' property is set Date: Tue, 17 Nov 2020 17:30:44 +0100 Message-Id: <20201117163045.307451-2-kwolf@redhat.com> In-Reply-To: <20201117163045.307451-1-kwolf@redhat.com> References: <20201117163045.307451-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 01:18:45 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_H4=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: kwolf@redhat.com, berrange@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=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 1 22:32:40 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=1605630879; cv=none; d=zohomail.com; s=zohoarc; b=UY5JBNwgSoO0hVNd0DYN0WcO9tkG0nY0OSj/22GKZ0hz3Yq3+utXLXudoZzkeAEiWPxAn2qfV9MEnPXPVv6Bp7gl1JXGJucDQmaK5BLWUTvBUHoI+tg3mWk0TgLxNmY+3sHUxzlzT22Cphf/C9bipVUsHxps3Y20ueQr5/g8cjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605630879; 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=ssuHWS7kPIV/WOHKWRJNLm9yNstMn2HqKqKoaX2sOmo=; b=WBReluMDJ4YaMNaxgLziCtnU3POBNsmGLUrvzGCQI5HYtAFGsJv+aPODNa5DO/eoAA2N5qSonSgunFPrtlxxZwrsXPVu3rZtH+m26etyBVdpMqA2dBDtA+A7frUmUGXkzNkjDVClL6CVGCBGnbSnv8mswI9VBxAy6fIU38jOnv8= 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 1605630879461584.9417216391354; Tue, 17 Nov 2020 08:34:39 -0800 (PST) Received: from localhost ([::1]:41420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf3wE-0005RC-CZ for importer@patchew.org; Tue, 17 Nov 2020 11:34:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf3sq-0001xV-Ol for qemu-devel@nongnu.org; Tue, 17 Nov 2020 11:31:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47256) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kf3sn-0007rO-6t for qemu-devel@nongnu.org; Tue, 17 Nov 2020 11:31:08 -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-385-0IKK3quRPF6B0bXKFzWR4w-1; Tue, 17 Nov 2020 11:31:01 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F1B81017DC6 for ; Tue, 17 Nov 2020 16:31:00 +0000 (UTC) Received: from merkur.redhat.com (ovpn-114-113.ams2.redhat.com [10.36.114.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id C42F16BF6B; Tue, 17 Nov 2020 16:30:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605630663; 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=ssuHWS7kPIV/WOHKWRJNLm9yNstMn2HqKqKoaX2sOmo=; b=Wc/LfXDuxFeaiRQby/9A0FDDJ7jZJEum3FyHu0xt41cUCa7sVJSCAg/VBViun47LAZiWqj xVqDuRyRaR+65LlI8skkm7H4ddyytezGJCQ5q9R2SiQjhndXmpSKA8+HIjYmBw10xiuvu4 dVusYBnTgyJev1jsWACq3sDhjp2Xp4g= X-MC-Unique: 0IKK3quRPF6B0bXKFzWR4w-1 From: Kevin Wolf To: qemu-devel@nongnu.org Subject: [PATCH for-5.2? 2/2] authz-simple: Check that 'identity' property is set Date: Tue, 17 Nov 2020 17:30:45 +0100 Message-Id: <20201117163045.307451-3-kwolf@redhat.com> In-Reply-To: <20201117163045.307451-1-kwolf@redhat.com> References: <20201117163045.307451-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 01:18:45 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_H4=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: kwolf@redhat.com, berrange@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=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