From nobody Mon Feb 9 04:03:26 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1644026526319632.4452789779011; Fri, 4 Feb 2022 18:02:06 -0800 (PST) Received: from localhost ([::1]:43646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGAOr-0008DH-MM for importer@patchew.org; Fri, 04 Feb 2022 21:02:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGA7F-0003sO-Hv for qemu-devel@nongnu.org; Fri, 04 Feb 2022 20:43:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41828) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGA6q-0003Je-Dq for qemu-devel@nongnu.org; Fri, 04 Feb 2022 20:43:32 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-440-afTDoptLOBGhpMONJeuDlg-1; Fri, 04 Feb 2022 20:43:12 -0500 Received: by mail-wm1-f69.google.com with SMTP id bg16-20020a05600c3c9000b0034bea12c043so8374457wmb.7 for ; Fri, 04 Feb 2022 17:43:12 -0800 (PST) Received: from redhat.com ([2a10:8005:331d:0:5c51:c095:613e:277c]) by smtp.gmail.com with ESMTPSA id s9sm3434950wrr.84.2022.02.04.17.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 17:43:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644025393; 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=y7OKSfT1V8bnQJ29ZyLRYs/eX2kJnKtsDQ8zfEcJa6g=; b=LSYSfxA9Oeb0D+6yB478TZUbYMfMPUSUcxw8uO0bDrxlB44KqJZUEW7o4hartMSfsGbTWj /kPBBSu0hwVQBWEGvyZv0lisHpbGd66MdCnMCWgra3Pwjy8AuxX9ZrcyOfRAv3aj3v4f/P 8ShQwvXZA27e6Kcz3lx1cC9Y4TnuRxQ= X-MC-Unique: afTDoptLOBGhpMONJeuDlg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=y7OKSfT1V8bnQJ29ZyLRYs/eX2kJnKtsDQ8zfEcJa6g=; b=t/RKnVdumuujmKuNxUcI4OrHO6/1Ci8NOAe3mAK1ZIsLuh12FOcf/ETBQA2VnmAj75 VdyFoeFheJX+xhJYwOGQcZT6UXLjgYd1Y9If5apLquyxTb0+UPcj7O6Dv6tAYjzWyRhT g+CwL8XF7CSR5w3mwD4OwRXTpXIQs4dgLlYxXjtFTx+EpgPopwqcOewM1zzkcFx1eX4z 0UgiBzLGpvYnSxQUqbPpVhhYyooaNo6wmW1NGkcrY7x4aX5JHvE/vG0zWhxe9atUjfSO aHTG54nAXcLiamlwZdkICOnvGkfdZKCKds9K1tdSuOwKXLGrWcuPlDhoF4Ge41UIEUek RPzQ== X-Gm-Message-State: AOAM531Z35jGLvQcn739qVHyCjZ8ah5g7k8NgncRNXlAmrUzIHXbrZkB Ha02h0Ck70Zf22G6OtQgEekV1Uyd+toXDDrLUv+NUBsDnNC/wzsdEIb3Wh7pREloAko13miXOYu Oi1jTI9al1vhcF94gh1Pfnt+jDo4cPXcXtzGe0xGT1crxbW7oDUwdzbuPVrj0 X-Received: by 2002:adf:ffd2:: with SMTP id x18mr845139wrs.188.1644025391268; Fri, 04 Feb 2022 17:43:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJxXCMw68XsTYlErT6xky3tEjtXr06J7YkNs4E4dSYOYs5VtAsfoG2Zz88uiv7Kts4EVhqMMNg== X-Received: by 2002:adf:ffd2:: with SMTP id x18mr845122wrs.188.1644025391077; Fri, 04 Feb 2022 17:43:11 -0800 (PST) Date: Fri, 4 Feb 2022 20:43:08 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 12/32] libvhost-user: prevent over-running max RAM slots Message-ID: <20220205014149.1189026-13-mst@redhat.com> References: <20220205014149.1189026-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20220205014149.1189026-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Disposition: inline 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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.092, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , David Hildenbrand , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Raphael Norwitz , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1644026529080100001 From: Raphael Norwitz When VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS support was added to libvhost-user, no guardrails were added to protect against QEMU attempting to hot-add too many RAM slots to a VM with a libvhost-user based backed attached. This change adds the missing error handling by introducing a check on the number of RAM slots the device has available before proceeding to process the VHOST_USER_ADD_MEM_REG message. Suggested-by: Stefan Hajnoczi Signed-off-by: Raphael Norwitz Message-Id: <20220117041050.19718-6-raphael.norwitz@nutanix.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: David Hildenbrand Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- subprojects/libvhost-user/libvhost-user.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvho= st-user/libvhost-user.c index 3f4d7221ca..2a1fa00a44 100644 --- a/subprojects/libvhost-user/libvhost-user.c +++ b/subprojects/libvhost-user/libvhost-user.c @@ -705,6 +705,14 @@ vu_add_mem_reg(VuDev *dev, VhostUserMsg *vmsg) { return false; } =20 + if (dev->nregions =3D=3D VHOST_USER_MAX_RAM_SLOTS) { + close(vmsg->fds[0]); + vu_panic(dev, "failing attempt to hot add memory via " + "VHOST_USER_ADD_MEM_REG message because the backend = has " + "no free ram slots available"); + return false; + } + /* * If we are in postcopy mode and we receive a u64 payload with a 0 va= lue * we know all the postcopy client bases have been received, and we --=20 MST