From nobody Mon Nov 17 16:05:17 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604510918; cv=none; d=zohomail.com; s=zohoarc; b=nR8wUN51FeHptKWKSU9ezjBnoJAqYj+J1zr3YmPukCWXEkkEkk6Z6j3nH2PMg4r9DekJbWFr/ad7oMXXOA930siC3ZI3qMK5NqdOhjh2972K+GpWIddVHKBGu1nxkJOTTQvKwenzUMI5w93XrVdlXbT8t5RwtL/oXYTNvF/U3V4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604510918; 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=bD8WHQ5vkPZgFU67Ydv6CRTwa7bMPjoclBtYbd6jK3c=; b=Q8oKqvAsggOH3C+kBdaEAj1hm2xk4zqbDB/FUOlBnQ/E5X5/vNkrY9Hw8NB7jTdBBBEioWiJ83ZdF2Jagz7O0WU3iv6i63k36G8/28O7xnq2+dA+Vjl5+YYxKI4xkDYWHNS6NMW5AsI2Z8j/dpPjAlGPi4xjqrumb/V/vf/ubLw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1604510918809275.58735986306283; Wed, 4 Nov 2020 09:28:38 -0800 (PST) Received: from localhost ([::1]:58752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaMaL-0005v0-OZ for importer@patchew.org; Wed, 04 Nov 2020 12:28:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaMXE-0000z5-Vr for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:25:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45215) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaMXB-0008Ba-UW for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:25:24 -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-528-eRHrlGKkOvqVzrcUNlO-EA-1; Wed, 04 Nov 2020 12:25:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8BBC11028D51 for ; Wed, 4 Nov 2020 17:25:17 +0000 (UTC) Received: from localhost (ovpn-114-68.rdu2.redhat.com [10.10.114.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E20660BFA; Wed, 4 Nov 2020 17:25:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604510720; 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=bD8WHQ5vkPZgFU67Ydv6CRTwa7bMPjoclBtYbd6jK3c=; b=PE+8dTVc7ryyWQIzjWLiFTiAwjyeR1fzbRgipif/WPj69ofteLzRUfmVs2D2DIKNXv4T7m GKLf2dBssIBWpy9jMIC0x4iQJ0fMLGd8c0UrnAxQTu5/IFUPk8h5Up1PHR4ttu91CNDPCy 4VY7pqpz9rymvFErD3luDMHk5npfBFA= X-MC-Unique: eRHrlGKkOvqVzrcUNlO-EA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 2/7] qom: Save size of struct field in Property struct Date: Wed, 4 Nov 2020 12:25:07 -0500 Message-Id: <20201104172512.2381656-3-ehabkost@redhat.com> In-Reply-To: <20201104172512.2381656-1-ehabkost@redhat.com> References: <20201104172512.2381656-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 22:09:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Igor Mammedov , "Daniel P. Berrange" , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) This will let the code that reads/writes the field ensure it will never go out of bounds. Signed-off-by: Eduardo Habkost --- Cc: Paolo Bonzini Cc: "Daniel P. Berrang=C3=A9" Cc: Eduardo Habkost Cc: qemu-devel@nongnu.org --- include/qom/field-property.h | 3 +++ include/qom/property-types.h | 1 + qom/property-types.c | 1 + 3 files changed, 5 insertions(+) diff --git a/include/qom/field-property.h b/include/qom/field-property.h index bc866e1c93..e64a2b3c07 100644 --- a/include/qom/field-property.h +++ b/include/qom/field-property.h @@ -27,7 +27,10 @@ struct Property { */ const char *qdev_prop_name; const PropertyInfo *info; + /** @offset: offset of field in object instance struct */ ptrdiff_t offset; + /** @size: size of field in object instance struct */ + size_t size; uint8_t bitnr; /** * @set_default: true if the default value should be set from @defval, diff --git a/include/qom/property-types.h b/include/qom/property-types.h index 3a36e1fec5..17bf007234 100644 --- a/include/qom/property-types.h +++ b/include/qom/property-types.h @@ -28,6 +28,7 @@ extern const PropertyInfo prop_info_link; .info =3D &(_prop), \ .offset =3D offsetof(_state, _field) \ + type_check(_type, typeof_field(_state, _field)), \ + .size =3D sizeof(typeof_field(_state, _field)), \ __VA_ARGS__ \ } =20 diff --git a/qom/property-types.c b/qom/property-types.c index f566c05ec2..856b5ae76d 100644 --- a/qom/property-types.c +++ b/qom/property-types.c @@ -485,6 +485,7 @@ static void set_prop_arraylen(Object *obj, Visitor *v, = const char *name, * being inside the device struct. */ arrayprop->offset =3D eltptr - (void *)obj; + arrayprop->size =3D prop->arrayfieldsize; assert(object_field_prop_ptr(obj, arrayprop) =3D=3D eltptr); object_property_add_field(obj, propname, arrayprop, op->allow_set); } --=20 2.28.0