From nobody Tue Apr 30 20:34:33 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=1605691124; cv=none; d=zohomail.com; s=zohoarc; b=eexNO6BcwHRbMLNlj55E/JDGsVzHPKgwbyW0OJo6SZFSNWxr2sy9RRfb4WDEToo7DVoicgFbkNxMagPvp7gQTUIg63+2Y4b9EDKuGvr/CU+f1xbnQTjvpzhI5VGz0QQA/8BQtEyDToE5KJRPFl8sZTbbaOfa1u2HHiMvTKBPd5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605691124; 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=H5e7Z9mVgVAfvKc0K+ExMKSfSKJQXpCbqcf+ysw2G9I=; b=fCMMCblu92p44k9SGtL3esQ8RewnjHU5Ps9BCK1kelajCe1sVsvDcTgFCUCL3O87ikSm1Z5hLlP9Re6OnPe7ErxpPmu3QonS1JK9QVjPFRcOI3jbEwxigSf8sQ4BKagTauey6TLBE4eElpHnAfZIMLouUxrBg1B4Y4TiDS84oCQ= 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 1605691124724820.0874691768488; Wed, 18 Nov 2020 01:18:44 -0800 (PST) Received: from localhost ([::1]:46728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJbv-0006Kp-J3 for importer@patchew.org; Wed, 18 Nov 2020 04:18:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfJaw-00052M-PX for qemu-devel@nongnu.org; Wed, 18 Nov 2020 04:17:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfJat-0003fd-9O for qemu-devel@nongnu.org; Wed, 18 Nov 2020 04:17:41 -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-444-wMso7LIXM5O3D_X9l9piDw-1; Wed, 18 Nov 2020 04:17:33 -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 AAD9810B9CA4; Wed, 18 Nov 2020 09:17:32 +0000 (UTC) Received: from localhost (ovpn-114-60.ams2.redhat.com [10.36.114.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5021D5C1D7; Wed, 18 Nov 2020 09:17:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605691057; 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=H5e7Z9mVgVAfvKc0K+ExMKSfSKJQXpCbqcf+ysw2G9I=; b=dG08Hjkq0n61rWzgS/T7x8ffbmZXNjTikp899/YkkjF1z4fhyDnGtoijME2S/VvyKPoBTE Zb10WZpMngNzV1xzKvRqzX1kN+dAO04ZB+/UDExo/qQ1FsHpvqKMxob2/XLr1IBifYI1R8 ZuQDmuZ6Rr53C/UhgwQZdZWe7ZzaEhU= X-MC-Unique: wMso7LIXM5O3D_X9l9piDw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 1/4] contrib/vhost-user-blk: avoid g_return_val_if() input validation Date: Wed, 18 Nov 2020 09:16:41 +0000 Message-Id: <20201118091644.199527-2-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=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 , 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 Reviewed-by: Markus Armbruster Reviewed-by: Stefano Garzarella --- contrib/vhost-user-blk/vhost-user-blk.c | 4 +++- 1 file changed, 3 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..1540d5e87d 100644 --- a/contrib/vhost-user-blk/vhost-user-blk.c +++ b/contrib/vhost-user-blk/vhost-user-blk.c @@ -404,7 +404,9 @@ 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)) { + 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 Apr 30 20:34:33 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=1605691139; cv=none; d=zohomail.com; s=zohoarc; b=MkcQDEpEG3AgXNd6fNDbPgM62aiXtnBsxsKRlWT+DzFhqIkC9AhTg9EmYQWkpj5yF3aCdM86cxf4Dgnxkni4BoAe2/yA8mnegVAeH9nXXqA5QxUEhjjxDtDa4f7HJ08DlB8GkBEw+boJi2wPXpljMM6IepQ8Gv8yf93omquc84k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605691139; 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=oRG1RXW8GZlRp5NVquq5gN1UIHhe7RO2Kv/LicCH7m4=; b=Q/t3ax/wayZoutI63k5qw5hp+KrxbyrXDLncmEyxQMuH8HnmrO6vLqmyfbLw3WlSqVL90MoE7W0UbwO2GC4JlcSER8K2PeJvMMO6dYSexknZdmUnqA8/oXSz2t6e22QAaF7DzhMJDhizvNVtS5gF1cwReu9VJ7pIGc8NU9WtzoI= 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 1605691139671989.7339119525546; Wed, 18 Nov 2020 01:18:59 -0800 (PST) Received: from localhost ([::1]:47330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJcA-0006a3-De for importer@patchew.org; Wed, 18 Nov 2020 04:18:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfJb6-00059I-TT for qemu-devel@nongnu.org; Wed, 18 Nov 2020 04:17:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfJb5-0003jz-A6 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 04:17:52 -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-196-Bi1y73EIPdmFJ_125DtCPA-1; Wed, 18 Nov 2020 04:17:48 -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 891A2100855F; Wed, 18 Nov 2020 09:17:47 +0000 (UTC) Received: from localhost (ovpn-114-60.ams2.redhat.com [10.36.114.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AC17196FB; Wed, 18 Nov 2020 09:17:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605691070; 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=oRG1RXW8GZlRp5NVquq5gN1UIHhe7RO2Kv/LicCH7m4=; b=gC+I/e/xivEW/+yVIuEe0Znm88k9yOl2yTTG6le7uNw0oVqwYWrcx3Dx+8h/jtdWDJUmhF osiBwiPi1dwWWZcc6JjUGp4YEQFmc8gO2aehUyxxdac7hApVY4421mWi1zQ+BxbUTQHD6Z hetiMGABwKq6q0ThVtU2N3+Tw0vCVps= X-MC-Unique: Bi1y73EIPdmFJ_125DtCPA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 2/4] contrib/vhost-user-gpu: avoid g_return_val_if() input validation Date: Wed, 18 Nov 2020 09:16:42 +0000 Message-Id: <20201118091644.199527-3-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.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=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 Reviewed-by: Markus Armbruster Reviewed-by: Stefano Garzarella --- contrib/vhost-user-gpu/vhost-user-gpu.c | 4 +++- 1 file changed, 3 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..f445ef28ec 100644 --- a/contrib/vhost-user-gpu/vhost-user-gpu.c +++ b/contrib/vhost-user-gpu/vhost-user-gpu.c @@ -1044,7 +1044,9 @@ vg_get_config(VuDev *dev, uint8_t *config, uint32_t l= en) { 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)) { + return -1; + } =20 if (opt_virgl) { g->virtio_config.num_capsets =3D vg_virgl_get_num_capsets(); --=20 2.28.0 From nobody Tue Apr 30 20:34:33 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=1605691161; cv=none; d=zohomail.com; s=zohoarc; b=ZyVw/V+NjvwchbuAIDts2bYJWoISPy+cY8Jb1PJkVu+oq7orSCdQJdSe+DjXgvthxuKKOiBF+qmF66Yo5AjBFQz+vvWDPZhlPLkuZeoJswrgHV/Kz0sXxNG2m+P2vKftzy56vKTvog8YAoQlhf+Y2EBwBOZH9rp/bYVquZglJRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605691161; 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=c5fFQrFQpIaRL7e4v6gghChhTerjxfxbxNn0peFpIoE=; b=ZiOfY1xPuNVyhZTQZBBgK++xBp9MOtXztw5cOXamAOONXL9MsLSU6RtZBV6NeC/hDhq5d3duwkAEtGGnYodmStdzle+zLj62FmX5nly0sm5oFFR+1fumRj5nI6ALdHEf9M1BcmS0I8z3QGDoOxswrDCK0rDcuns/Ai3leNhYpBs= 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 160569116125257.366444567334725; Wed, 18 Nov 2020 01:19:21 -0800 (PST) Received: from localhost ([::1]:49552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJcW-0007WD-5y for importer@patchew.org; Wed, 18 Nov 2020 04:19:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfJbQ-0005nr-Eb for qemu-devel@nongnu.org; Wed, 18 Nov 2020 04:18:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:42952) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfJbO-0003mb-Pz for qemu-devel@nongnu.org; Wed, 18 Nov 2020 04:18:12 -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-142-OHaBGSM3PkacvtpXaGKFmg-1; Wed, 18 Nov 2020 04:18:08 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 37DF764144; Wed, 18 Nov 2020 09:18:07 +0000 (UTC) Received: from localhost (ovpn-114-60.ams2.redhat.com [10.36.114.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39D871759F; Wed, 18 Nov 2020 09:17:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605691090; 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=c5fFQrFQpIaRL7e4v6gghChhTerjxfxbxNn0peFpIoE=; b=F12raHjjgVOzN0XhSjRvpxK/ghd5rNzQ0NrcCKbwglwqPDFmp9WuFCWi205MW39AluY6md TGiC4bkaJcT5QXlqLY6ACWrhYJOqU+/PEMuQKwVIs0sEB02ASR9SZqO8c/dqRtQwAMzjFF 8NXKmLM7yPaJR4KgRbFSanHIOghKWc4= X-MC-Unique: OHaBGSM3PkacvtpXaGKFmg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 3/4] contrib/vhost-user-input: avoid g_return_val_if() input validation Date: Wed, 18 Nov 2020 09:16:43 +0000 Message-Id: <20201118091644.199527-4-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.15 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 Reviewed-by: Markus Armbruster Reviewed-by: Stefano Garzarella --- contrib/vhost-user-input/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/mai= n.c index 6020c6f33a..50a8a03d9b 100644 --- a/contrib/vhost-user-input/main.c +++ b/contrib/vhost-user-input/main.c @@ -212,7 +212,9 @@ static int vi_get_config(VuDev *dev, uint8_t *config, u= int32_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)) { + return -1; + } =20 if (vi->sel_config) { memcpy(config, vi->sel_config, len); --=20 2.28.0 From nobody Tue Apr 30 20:34:33 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=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 Reviewed-by: Markus Armbruster Reviewed-by: Stefano Garzarella --- 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