From nobody Thu Apr 2 18:47:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1774605637; cv=none; d=zohomail.com; s=zohoarc; b=ABFuxHM+a0gzbgaId9f3X5aGFRUGOlb/IfeKOB2AShQNq0NOYYtrKHKrhhO9v6qRScfiNrTL7/aEStepmJcCX9tyZFnd7VZdda3HT6tmfPilXxZH8z3RrzpPcumRS5oytDkzy2Qld/3Guu/YWpf7uH4keYo7LYmHOq9X9x0HLV0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774605637; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=ompHEWFq2dT7sYKfLYr3ymzuTVnmvEWzEqZtYujKyA4=; b=QkDXmlflVJXNPhbJ8TgsO3pqvnAuaSTO9sCmDhP93JcYpmyDUkkCZzFdMeg70fGk6qZp1bNWU6MG1qLH2dTXUPa6sm0GY6tzKuuPx4z3ixkoSQXV8A+Egg66oq1YMSIdDpKHiThd26KKx9nyismSe25KD42gOqdD8qhWf1hrojI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1774605637538684.9307043436249; Fri, 27 Mar 2026 03:00:37 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 087763F8AB; Fri, 27 Mar 2026 06:00:37 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 619AF4198C; Fri, 27 Mar 2026 05:57:45 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 0ECCD3F88D; Fri, 27 Mar 2026 05:57:40 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 805DA3F340 for ; Fri, 27 Mar 2026 05:55:01 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-410-AKP-d52FObupkYPgsTg_Bw-1; Fri, 27 Mar 2026 05:54:59 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7842B1800283 for ; Fri, 27 Mar 2026 09:54:58 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.45.242.5]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BFB713000223 for ; Fri, 27 Mar 2026 09:54:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774605301; 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: in-reply-to:in-reply-to:references:references; bh=ompHEWFq2dT7sYKfLYr3ymzuTVnmvEWzEqZtYujKyA4=; b=jRKNsuo1rS0CFeeLd0UNxzK+SPLT6Pi8Ed7HlTzclxRSAahuxi55/0EGIkmxGuzzlKars9 R8KAy6BHLO3PU/dY4W75vP+k33AXI4h8wwrKdOKpySF9sWHcZeu5/xpPiWy5cNATFejeQ5 AUJqRgc/xxRE0OL3GpZzikXlbOR2P8w= X-MC-Unique: AKP-d52FObupkYPgsTg_Bw-1 X-Mimecast-MFC-AGG-ID: AKP-d52FObupkYPgsTg_Bw_1774605298 To: devel@lists.libvirt.org Subject: [PATCH 6/6] util: virfile: Don't over-allocate buffers in saferead_lim Date: Fri, 27 Mar 2026 10:54:44 +0100 Message-ID: <91a609cc61517e4e8ded48de6de8faf2ca235416.1774605192.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hRy6YZt1wP9BHNASxjCrsUuJT5VGbJfEDju4tug5yKY_1774605298 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EOKF2FQBXF7WUOYIUXIYMT7HV3SUPUQ4 X-Message-ID-Hash: EOKF2FQBXF7WUOYIUXIYMT7HV3SUPUQ4 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1774605640040154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Limit the size of the4 allocated buffer to max_len + 1. Signed-off-by: Peter Krempa --- src/util/virfile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index bc3faedd4e..e7549197cd 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1503,11 +1503,14 @@ saferead_lim(int fd, size_t max_len, size_t *length) int count; int requested; - if (size + BUFSIZ + 1 > alloc) { + if (alloc < max_len + 1 && + size + BUFSIZ + 1 > alloc) { alloc +=3D alloc / 2; if (alloc < size + BUFSIZ + 1) alloc =3D size + BUFSIZ + 1; + alloc =3D MIN(alloc, max_len + 1); + VIR_REALLOC_N(buf, alloc); } --=20 2.53.0