From nobody Mon Feb 9 11:33:16 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 ARC-Seal: i=1; a=rsa-sha256; t=1605691207; cv=none; d=zohomail.com; s=zohoarc; b=iiUYVXOG4cPS1p6CSbkQfeviSXDiKyPSueU9DGdiAUIXP+qih2uRxWn4guL4OT9x+9oVr27o1+vUIdYzqTQdLJ2dXJrqHZB6CRKEMXlRV2Bb1YTMfk52psYfAffN9skwLp8SkC2ZSvDmZgHdSI2rcEGO4B7Jyzc5F9hSrA3ngeQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605691207; 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=nwhnoq3rJqHhZaGRH+OpJxjbD2ZBhsx1NiOmFaa64XU=; b=HbeTfNHj8dOBTxPLx+dl24JpykXoBANyNh6g6SgyhLNLs5jjvx9Jaa/wKKjz8JWp56+Zr4vqihKOAiRkv5cHY/UYq2ve160QItsdTyx+9Ldw58aOPIFU2isUSECAW85rlpoAySTxfE757DIqcKL+ZA0nBd++qfa2d6eOaqZXBt8= 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 1605691207096350.3190058377696; Wed, 18 Nov 2020 01:20:07 -0800 (PST) Received: from localhost ([::1]:53840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJdG-0000qz-1h for importer@patchew.org; Wed, 18 Nov 2020 04:20:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfJbh-0006UF-C4 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 04:18:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfJbf-0003pZ-MZ for qemu-devel@nongnu.org; Wed, 18 Nov 2020 04:18:29 -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-102-0BcAHDk8OqiVnLQbn7sNqg-1; Wed, 18 Nov 2020 04:18:23 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E3C4D1008562; Wed, 18 Nov 2020 09:18:21 +0000 (UTC) Received: from localhost (ovpn-114-60.ams2.redhat.com [10.36.114.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 934545C1A3; Wed, 18 Nov 2020 09:18:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605691107; 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=nwhnoq3rJqHhZaGRH+OpJxjbD2ZBhsx1NiOmFaa64XU=; b=My9Hul86o63jvm1RyNppqsqA90TfoXnJo47GrhpKyRA4Nw/W4yPh5qiWe387F2EX06hjv9 sCyk0ZNE07XA867yF6PUUgLf9fTTz/XD4Rbs+mmdyyjRpme6KlshjYmasycAQBHTqXzawa bhF5FvZ9SmNy/x7JlMkgvmHh662c758= X-MC-Unique: 0BcAHDk8OqiVnLQbn7sNqg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 4/4] block/export: avoid g_return_val_if() input validation Date: Wed, 18 Nov 2020 09:16:44 +0000 Message-Id: <20201118091644.199527-5-stefanha@redhat.com> In-Reply-To: <20201118091644.199527-1-stefanha@redhat.com> References: <20201118091644.199527-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@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=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 19:41:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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, MIME_BASE64_TEXT=1.741, 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: Kevin Wolf , qemu-block@nongnu.org, "Michael S. Tsirkin" , Markus Armbruster , Coiby Xu , Raphael Norwitz , Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Do not validate input with g_return_val_if(). This API is intended for checking programming errors and is compiled out with -DG_DISABLE_CHECKS. Use an explicit if statement for input validation so it cannot accidentally be compiled out. Suggested-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- block/export/vhost-user-blk-server.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user= -blk-server.c index 62672d1cb9..d143ce8993 100644 --- a/block/export/vhost-user-blk-server.c +++ b/block/export/vhost-user-blk-server.c @@ -267,7 +267,9 @@ vu_blk_get_config(VuDev *vu_dev, uint8_t *config, uint3= 2_t len) VuServer *server =3D container_of(vu_dev, VuServer, vu_dev); VuBlkExport *vexp =3D container_of(server, VuBlkExport, vu_server); =20 - g_return_val_if_fail(len <=3D sizeof(struct virtio_blk_config), -1); + if (len > sizeof(struct virtio_blk_config)) { + return -1; + } =20 memcpy(config, &vexp->blkcfg, len); return 0; --=20 2.28.0