From nobody Tue May 21 22:18:13 2024 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=1606922944; cv=none; d=zohomail.com; s=zohoarc; b=jLT8vlKzmN0FEsOweQh1x8L3pudAYJqfhG8tIxrFDhdwdJiQ4HoppbZJTrpUR0Zwfm1I+Ewj5euSA1Zrjgkfc7pzOZArE6N4Zn0OQMpPAnNqYDDyfbJRDGRDc5g9Npi6D0/CdgE7fRsGUkbWqNGX9SzhmFN5WihzFX4KYzc021E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606922944; 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=4f4fF+jza61JyObyzKSwizPk2hRlmVl4AjLmXsZW5sQ=; b=VQTmSghGPbVBYFfSxzrZBHI1mGYFFvVoCYKEwf5SlLYYTuJ36s64I32b15ma3NeFZjw8aQz180zFYvp0BH1pZXKb12rhjEvy1vVZwrN30Qhlg2/KVfjnHSR5FHR1gqefutjAMrkiCTETAEN05PBmRlarnP9y5uqy3Vz32wnx8zk= 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 1606922944636481.85380201199087; Wed, 2 Dec 2020 07:29:04 -0800 (PST) Received: from localhost ([::1]:50908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkU3y-0007Et-V5 for importer@patchew.org; Wed, 02 Dec 2020 10:29:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkU1t-0005V8-S5 for qemu-devel@nongnu.org; Wed, 02 Dec 2020 10:26:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50161) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkU1p-000411-S0 for qemu-devel@nongnu.org; Wed, 02 Dec 2020 10:26:53 -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-359-C0d1ZxSkNa--IG19JFHvyA-1; Wed, 02 Dec 2020 10:26:45 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 524948042AC; Wed, 2 Dec 2020 15:26:44 +0000 (UTC) Received: from localhost (ovpn-114-255.ams2.redhat.com [10.36.114.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id E64BE19C48; Wed, 2 Dec 2020 15:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606922809; 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=4f4fF+jza61JyObyzKSwizPk2hRlmVl4AjLmXsZW5sQ=; b=LJrARZMJr7mMAA+gGVjEfvonrQQyN2BK4fzfyRh0KrjtxGHjtpP7Vr6eBx70qF24Xk8+il 2i/msA3U1Bx+wxQADUateuX+QSUU32RBQRM5rhSCEcakqoH/zhK25mclqxHZlIf8+DIZ6+ cO2LB++QtGcSSkxwz+kRtKFsk709kq0= X-MC-Unique: C0d1ZxSkNa--IG19JFHvyA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v2 1/4] contrib/vhost-user-blk: avoid g_return_val_if() input validation Date: Wed, 2 Dec 2020 15:26:08 +0000 Message-Id: <20201202152611.677753-2-stefanha@redhat.com> In-Reply-To: <20201202152611.677753-1-stefanha@redhat.com> References: <20201202152611.677753-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.495, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Max Reitz , Stefano Garzarella 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 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Raphael Norwitz Reviewed-by: Stefano Garzarella --- contrib/vhost-user-blk/vhost-user-blk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-b= lk/vhost-user-blk.c index dc981bf945..60e3c9ed37 100644 --- a/contrib/vhost-user-blk/vhost-user-blk.c +++ b/contrib/vhost-user-blk/vhost-user-blk.c @@ -404,7 +404,11 @@ vub_get_config(VuDev *vu_dev, uint8_t *config, uint32_= t len) VugDev *gdev; VubDev *vdev_blk; =20 - g_return_val_if_fail(len <=3D sizeof(struct virtio_blk_config), -1); + if (len > sizeof(struct virtio_blk_config)) { + fprintf(stderr, "Invalid get_config len %u, expected <=3D %zu\n", + len, sizeof(struct virtio_blk_config)); + return -1; + } =20 gdev =3D container_of(vu_dev, VugDev, parent); vdev_blk =3D container_of(gdev, VubDev, parent); --=20 2.28.0 From nobody Tue May 21 22:18:13 2024 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=1606922952; cv=none; d=zohomail.com; s=zohoarc; b=jPAtEuSmUJ0XZj19O6pnG0KzpqjwVYNInnmkjlMl+lY6SvWWdm3ykXm7bpOs4GPLMf/ukmct6j8gEYwXTaJm2LeavOBqz7dZIjUJp8Mx9ZjV9ZI1oGwkJYRnkYGKsTvyggCu2bFUqgug9fVc+mxJAeHPhXPBK7Rhq4HNPQc1PZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606922952; 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=lPVhlieJZjI5dUsg4mXlWox9fLe5bNs3rgVncgUdYNs=; b=K6X4HvDS/ijpt5HpNBaXdcah5JIjKY5RSpdWVEVUknB+KZf4jjEHqa6siRBPUVyJK5qdjJg8tBX+alNEfbm+X1ilQjqiC6CniwXnLDFYM6woMY6zXkEJeqDHrovjec9cuPhFu5HR4zNsWWhLiSKm9lTBBvdFr0VeI6QooF8kviY= 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 1606922952151758.8694259935012; Wed, 2 Dec 2020 07:29:12 -0800 (PST) Received: from localhost ([::1]:51374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkU47-0007QL-0S for importer@patchew.org; Wed, 02 Dec 2020 10:29:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkU24-0005k1-Cb for qemu-devel@nongnu.org; Wed, 02 Dec 2020 10:27:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:32363) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkU22-00042g-G1 for qemu-devel@nongnu.org; Wed, 02 Dec 2020 10:27:04 -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-72-vX1BCKCcM7mLz5aRaCYj_A-1; Wed, 02 Dec 2020 10:27: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 D8E081005E57; Wed, 2 Dec 2020 15:26:57 +0000 (UTC) Received: from localhost (ovpn-114-255.ams2.redhat.com [10.36.114.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id B2FF460854; Wed, 2 Dec 2020 15:26:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606922821; 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=lPVhlieJZjI5dUsg4mXlWox9fLe5bNs3rgVncgUdYNs=; b=V3BlPWTJjaBDEvKSawRW9EGcXo8xOhEw1lkQ1RfSbIMS8bU8f/e0sMiOiPI2yXaGWDuLmJ a+GWqA5dbVzbBIeF2Yb8WosbJgaG+GIkTwmjmzy4za2ikQ9FFUzh8j3aUPthKWdT3ufJF9 1rH3yYhPscNKTbVEqe1q4DobVYs1Gv0= X-MC-Unique: vX1BCKCcM7mLz5aRaCYj_A-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v2 2/4] contrib/vhost-user-gpu: avoid g_return_val_if() input validation Date: Wed, 2 Dec 2020 15:26:09 +0000 Message-Id: <20201202152611.677753-3-stefanha@redhat.com> In-Reply-To: <20201202152611.677753-1-stefanha@redhat.com> References: <20201202152611.677753-1-stefanha@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=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-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.495, 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 , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Max Reitz , Stefano Garzarella 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 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefano Garzarella --- contrib/vhost-user-gpu/vhost-user-gpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/vhost-user-gpu/vhost-user-gpu.c b/contrib/vhost-user-g= pu/vhost-user-gpu.c index a019d0a9ac..534bad24d1 100644 --- a/contrib/vhost-user-gpu/vhost-user-gpu.c +++ b/contrib/vhost-user-gpu/vhost-user-gpu.c @@ -1044,7 +1044,11 @@ vg_get_config(VuDev *dev, uint8_t *config, uint32_t = len) { VuGpu *g =3D container_of(dev, VuGpu, dev.parent); =20 - g_return_val_if_fail(len <=3D sizeof(struct virtio_gpu_config), -1); + if (len > sizeof(struct virtio_gpu_config)) { + g_critical("%s: len %u is larger than %zu", + __func__, len, sizeof(struct virtio_gpu_config)); + return -1; + } =20 if (opt_virgl) { g->virtio_config.num_capsets =3D vg_virgl_get_num_capsets(); --=20 2.28.0 From nobody Tue May 21 22:18:13 2024 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=1606923188; cv=none; d=zohomail.com; s=zohoarc; b=YgHlMdZf69HASTkAX9DHOs5eP9uRFr7GuFwn1oPpKlxIr62w3n2Qt5DqfW5PEVIIJ/Os9zi7SBALARxMiLiQBdINBdR0rjOYOu5yF10Op/v3oel/T5dwPTJR0GiGmmwW6VwX/ZtvLFT91sUjjzCC3PsK1lH36szc+X7CYsGngpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606923188; 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=0utENm6x05s6LlV+yETgvJfBM19cBadB8y673FhcQ5I=; b=Fa9r+kyalkEae3IRkKTuuRBNDc94AIwkd/QHmeMDo/0T+3+mv08oOwwFnd+dXxrcZ5Y0eRzcgxTHZZXp36b7YAPQ6yJpSkB3ed1Hcv/FaswLodMj4OogHrOr5RfWKbSjqsQt44js5QK9ZeGBzcecduY5YXZMNU4H/Pa3yaJbyVg= 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 1606923188296245.2223108666708; Wed, 2 Dec 2020 07:33:08 -0800 (PST) Received: from localhost ([::1]:58162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkU7t-00024H-3N for importer@patchew.org; Wed, 02 Dec 2020 10:33:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkU2P-0006FX-MW for qemu-devel@nongnu.org; Wed, 02 Dec 2020 10:27:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49684) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkU2I-00046w-00 for qemu-devel@nongnu.org; Wed, 02 Dec 2020 10:27:25 -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-579-zL02Zw54MgWnunoTiugUHw-1; Wed, 02 Dec 2020 10:27:13 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 931A3427C9; Wed, 2 Dec 2020 15:27:12 +0000 (UTC) Received: from localhost (ovpn-114-255.ams2.redhat.com [10.36.114.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39A715D9DB; Wed, 2 Dec 2020 15:26:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606922837; 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=0utENm6x05s6LlV+yETgvJfBM19cBadB8y673FhcQ5I=; b=SkIPE+XSa9bJM7/Hk8FsXyDp4xMwZvZwWdwj44ZYfpq67ZsK2v+EFTY1NAwR/hAhbgkCbK qQaYC9qj/JBZywThUhWU1xjPBKQ+KdrMhSnKBfyPGl68tBQ2wYg8up90DiqXoIemfZcbHY HLqJFM2z6xB3p2Nt8TRdzAO3A3ZakUc= X-MC-Unique: zL02Zw54MgWnunoTiugUHw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v2 3/4] contrib/vhost-user-input: avoid g_return_val_if() input validation Date: Wed, 2 Dec 2020 15:26:10 +0000 Message-Id: <20201202152611.677753-4-stefanha@redhat.com> In-Reply-To: <20201202152611.677753-1-stefanha@redhat.com> References: <20201202152611.677753-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.495, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Max Reitz , Stefano Garzarella 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 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefano Garzarella --- contrib/vhost-user-input/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/mai= n.c index 6020c6f33a..1d79c61200 100644 --- a/contrib/vhost-user-input/main.c +++ b/contrib/vhost-user-input/main.c @@ -212,7 +212,11 @@ static int vi_get_config(VuDev *dev, uint8_t *config, = uint32_t len) { VuInput *vi =3D container_of(dev, VuInput, dev.parent); =20 - g_return_val_if_fail(len <=3D sizeof(*vi->sel_config), -1); + if (len > sizeof(*vi->sel_config)) { + g_critical("%s: len %u is larger than %zu", + __func__, len, sizeof(*vi->sel_config)); + return -1; + } =20 if (vi->sel_config) { memcpy(config, vi->sel_config, len); --=20 2.28.0 From nobody Tue May 21 22:18:13 2024 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=1606926887; cv=none; d=zohomail.com; s=zohoarc; b=K4Twohan0erI9C1BhNwx4ZyGDjxLnFKooYZVvotkcFRBOQCE8NQgckoVPU9VGqCgMH5WWPbN9Bj/mKwGPSgIy1nTtEAf0hs/hxXeNJ2rvcEEUIi3LfCXCRWpbBd1MwAA76Af048qfF8ZyU0/PJknfvMfVE9+bYnsKQQ7FNikxcY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606926887; 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=+QVw1FA0gSbZOuZ4y7uGJDFYO+dNUFEqyXxgdyQXFpQ=; b=YYRAuNbxWLPeYRqPpCrbuh4j52A5LeLBqJyyhCm4sI/oY89fA0G2djWnAbjaqC0Qi/fMnlpn7NisRTOBNVuuZf9S6UivxGSd/qrDl4k/Yr1UPayQfmGHu2k35CVylYUwdRG5BWxEPFxBZ0e/N3RpJR5y1UTU7ihtwsYWh2ItS5Y= 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 1606926887487530.0550393424271; Wed, 2 Dec 2020 08:34:47 -0800 (PST) Received: from localhost ([::1]:53812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkU58-0008VY-UX for importer@patchew.org; Wed, 02 Dec 2020 10:30:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkU2d-0006SG-NO for qemu-devel@nongnu.org; Wed, 02 Dec 2020 10:27:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38448) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkU2b-000493-18 for qemu-devel@nongnu.org; Wed, 02 Dec 2020 10:27:39 -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-169-XL5BWiaXOO6PdMl8NP6oYA-1; Wed, 02 Dec 2020 10:27:29 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 19DE75708B; Wed, 2 Dec 2020 15:27:28 +0000 (UTC) Received: from localhost (ovpn-114-255.ams2.redhat.com [10.36.114.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDDF71001B2C; Wed, 2 Dec 2020 15:27:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606922851; 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=+QVw1FA0gSbZOuZ4y7uGJDFYO+dNUFEqyXxgdyQXFpQ=; b=cPlwyZGzp2Kni996mjg+2Zomr93Uz71JOvudx4bXRjNSn4fGzK0E2stnKqnwv4mwHzbe51 VaJwY5rPdCaYh0Y2LizpWM0Hd0I0jiIFcziYOzJA3dQGlOuMpPscXeB5hWZL3is7Lttnfp PbS+OEXax0ToUh93lokQbJKtX4DYJgU= X-MC-Unique: XL5BWiaXOO6PdMl8NP6oYA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v2 4/4] block/export: avoid g_return_val_if() input validation Date: Wed, 2 Dec 2020 15:26:11 +0000 Message-Id: <20201202152611.677753-5-stefanha@redhat.com> In-Reply-To: <20201202152611.677753-1-stefanha@redhat.com> References: <20201202152611.677753-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.495, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Max Reitz , Stefano Garzarella 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 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefano Garzarella --- block/export/vhost-user-blk-server.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user= -blk-server.c index 62672d1cb9..bccbc98d57 100644 --- a/block/export/vhost-user-blk-server.c +++ b/block/export/vhost-user-blk-server.c @@ -267,7 +267,11 @@ vu_blk_get_config(VuDev *vu_dev, uint8_t *config, uint= 32_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)) { + error_report("Invalid get_config len %u, expected <=3D %zu", + len, sizeof(struct virtio_blk_config)); + return -1; + } =20 memcpy(config, &vexp->blkcfg, len); return 0; --=20 2.28.0