From nobody Fri Apr 19 06:57:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1545342119070221.94955360580195; Thu, 20 Dec 2018 13:41:59 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E6C08E67A; Thu, 20 Dec 2018 21:41:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D184E5EE0D; Thu, 20 Dec 2018 21:41:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 652D4181B9E7; Thu, 20 Dec 2018 21:41:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wBKLfeRj031609 for ; Thu, 20 Dec 2018 16:41:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4F699692A0; Thu, 20 Dec 2018 21:41:40 +0000 (UTC) Received: from unknown0050b6a41c42.attlocal.net.com (ovpn-116-12.phx2.redhat.com [10.3.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BC9168D57 for ; Thu, 20 Dec 2018 21:41:39 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Thu, 20 Dec 2018 16:41:33 -0500 Message-Id: <20181220214134.12937-2-jferlan@redhat.com> In-Reply-To: <20181220214134.12937-1-jferlan@redhat.com> References: <20181220214134.12937-1-jferlan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] security: Resolve possible memory leak X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 20 Dec 2018 21:41:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" If virSecuritySELinuxRestoreFileLabel returns 0 or -1 too soon, then the @newpath will be leaked. Suggested-by: Michal Privoznik Signed-off-by: John Ferlan Reviewed-by: J=C3=A1n Tomko --- src/security/security_selinux.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 4de8b6f9cd..f3690a4cb1 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1477,10 +1477,12 @@ virSecuritySELinuxRestoreFileLabel(virSecurityManag= erPtr mgr, goto cleanup; } =20 - if ((rc =3D virSecuritySELinuxTransactionAppend(path, NULL, false, tru= e)) < 0) - return -1; - else if (rc > 0) - return 0; + if ((rc =3D virSecuritySELinuxTransactionAppend(path, NULL, false, tru= e)) < 0) { + goto cleanup; + } else if (rc > 0) { + ret =3D 0; + goto cleanup; + } =20 if (recall) { if ((rc =3D virSecuritySELinuxRecallLabel(newpath, &fcon)) < 0) { --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 19 06:57:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1545342109243689.4203972085696; Thu, 20 Dec 2018 13:41:49 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E228D1393F7; Thu, 20 Dec 2018 21:41:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7054F1019633; Thu, 20 Dec 2018 21:41:46 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 917763F602; Thu, 20 Dec 2018 21:41:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wBKLfg8c031624 for ; Thu, 20 Dec 2018 16:41:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8239068D57; Thu, 20 Dec 2018 21:41:42 +0000 (UTC) Received: from unknown0050b6a41c42.attlocal.net.com (ovpn-116-12.phx2.redhat.com [10.3.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F2F869284 for ; Thu, 20 Dec 2018 21:41:40 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Thu, 20 Dec 2018 16:41:34 -0500 Message-Id: <20181220214134.12937-3-jferlan@redhat.com> In-Reply-To: <20181220214134.12937-1-jferlan@redhat.com> References: <20181220214134.12937-1-jferlan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] security: Fix comparison for virSecuritySELinuxRecallLabel X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 20 Dec 2018 21:41:47 +0000 (UTC) The @con type security_context_t is actually a "char *", so the correct check should be to dereference one more level; otherwise, we could return/use the NULL pointer later in a subsequent virSecuritySELinuxSetFileconImpl call (using @fcon). Suggested-by: Michal Pr=C3=ADvozn=C3=ADk Signed-off-by: John Ferlan Reviewed-by: J=C3=A1n Tomko --- src/security/security_selinux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index f3690a4cb1..5cdb839c13 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -211,7 +211,7 @@ virSecuritySELinuxRecallLabel(const char *path, path, con) < 0) return -1; =20 - if (!con) + if (!*con) return 1; =20 return 0; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list