From patchwork Fri Jul 26 15:19:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 169856 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp190718ilk; Fri, 26 Jul 2019 08:20:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqywEyfxgGwgyD/iT35u3vsCQ+EmbI2nZe1+X0wWarKTgsWExL082r0jz8zQ8Y3QH7qOTRac X-Received: by 2002:a50:8828:: with SMTP id b37mr82880296edb.266.1564154427091; Fri, 26 Jul 2019 08:20:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564154427; cv=none; d=google.com; s=arc-20160816; b=Xnma3LCOF7fnYTspXZ9TPAMOhbBC8KuBrYnjBAOemdsOPh2+PB0irBm0OOJzAf7N0e efwvi21c66GbcseOywBx801xJntvD/1EFiUONZTbZcVrXRn0EQYCYi64eHCyAs596dc3 5s3A0WU4Yg9DXS2jvdqDh06AImnhlo1Ol8mDKjkWdeemxy/OtvxIvOKSHqNnheZGcSkr tP59WVl2zrlN8ULv2eq6L3fzeaK6gttMqMUabX/qMG2e0tNbvhBSmLPYKlAOZSs1E5wO GG1EcZDv3epNDLSkhIqReWY4hnjPh462kXxfLttDX00IUNdC9CJEUvU9FRe9vuC/jbCK E0iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=8Ez3hO5NBzLE8OGsz9miDbwv9XPAsoT5BmbFIkSdYCU=; b=HCIeqEjo4To76Y1Q5PYl2uJ/ewIGZR2O0huvWFCOpHaFWC40V3yM2ZW/jwJDOn7LyZ 9xwdao/6wQpZ8c0Gi7wjQl196X1EdZ4WfjCTLRyT4KIsoQiN1odXehKiOmdF4MsSDaLz VsLyLG3GQnjUUr8VwrdvDXS4HqkndB+kmwBwBVFvObmhdGxZgpBvAXM0XY0C5SSrljvt IxOs6tH99qM5TC0OJgimWTtE/AyDaGZeq62my2B3/Cht34b8AmOZEKG59yiAyBGORicH pGMMFNCvxod55w3J7/166GGzs742eS4J6vuw5CI/9x3hZ+DexBC861+AtRMEj4uJMmEe LDUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zrudgZOK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h4si13031485edb.133.2019.07.26.08.20.26 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jul 2019 08:20:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zrudgZOK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr21B-0000wr-Ct for patch@linaro.org; Fri, 26 Jul 2019 11:20:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37594) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr20m-0000mk-Bl for qemu-devel@nongnu.org; Fri, 26 Jul 2019 11:20:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hr20k-0006zn-VI for qemu-devel@nongnu.org; Fri, 26 Jul 2019 11:20:00 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:44128) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hr20k-0006xI-NC for qemu-devel@nongnu.org; Fri, 26 Jul 2019 11:19:58 -0400 Received: by mail-wr1-x42e.google.com with SMTP id p17so54814585wrf.11 for ; Fri, 26 Jul 2019 08:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=8Ez3hO5NBzLE8OGsz9miDbwv9XPAsoT5BmbFIkSdYCU=; b=zrudgZOKePIXYhIIBGLfOABPT0SHQZuKHPmPn3TT57RLA9CTpKg/lgSz1wOSVKOR7/ QR8fgQOEohByVgb+pBGH63sDDQjgTRpMs5oibYWb5Jn5tlhEFMe93oPTmCF1TOKCMIL3 Mu8/MSzVDUpCpjgVdTfkZJKw+CWUcoVqHSZnbNWBmjrIr6LXB2WasG2houjGL5xQVGPK JEI2dCRWp2sNSMLY4LHMizj+j5DkqjAjr8VLdW3kWDNET8eY/hOLL53V3BOZFr05cCGL kqjc66zoy+5N0Mm83RaDP0aWQzbnu2XHg1i3maH1eXT2GhQYKvaO10DVFDAZwSvi+m0t bkbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8Ez3hO5NBzLE8OGsz9miDbwv9XPAsoT5BmbFIkSdYCU=; b=cP4KuxIs9204uqLIIXJb/VqRRv9VGsjkb9cJ4Ik46BrkJkPhhFEZqN8+ZzjNI4F1Ho 641gBPkRfdIjQQl8e090vxv1YGotsAxxsJcP27x/SiSHkL8E/L8VawPmhRo/P4hsNwEH QSqxKhBMIsd8miT/wPfr2toCrZk/eDEtsWVWEEf3AXUcsMMpFDy+jOr/wezXy5b+x/TQ 2JL6vQTGx0p3ufwIlJ6HIUheJk6H+8t4I5oi6FeI30kHzescQRWVx823xQ8n2k5hq3JR roLEnhQ6e9vVl3/e5S/wYwPeyVMFILXvbYUyVQ3kVX5LYTTCd7T7UTAu/BpYFJ3/oCob heXA== X-Gm-Message-State: APjAAAWjg3dZRD62i8ImsoYbYynNo3u9/Bp33S9EGXza0oxVt0xtyT59 dS09Ti7guZVqxICkcDUAMe5RWZW506XqKQ== X-Received: by 2002:adf:c70e:: with SMTP id k14mr105934337wrg.201.1564154397480; Fri, 26 Jul 2019 08:19:57 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id v16sm32746844wrn.28.2019.07.26.08.19.56 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 26 Jul 2019 08:19:57 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 16:19:50 +0100 Message-Id: <20190726151952.1932-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190726151952.1932-1-peter.maydell@linaro.org> References: <20190726151952.1932-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PULL 3/5] vmstate.h: Type check VMSTATE_STRUCT_VARRAY macros 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The VMSTATE_STRUCT_VARRAY_UINT32 macro is intended to handle migrating a field which is an array of structs, but where instead of migrating the entire array we only migrate a variable number of elements of it. The VMSTATE_STRUCT_VARRAY_POINTER_UINT32 macro is intended to handle migrating a field which is of pointer type, and points to a dynamically allocated array of structs of variable size. We weren't actually checking that the field passed to VMSTATE_STRUCT_VARRAY_UINT32 really is an array, with the result that accidentally using it where the _POINTER_ macro was intended would compile but silently corrupt memory on migration. Add type-checking that enforces that the field passed in is really of the right array type. This applies to all the VMSTATE macros which use flags including VMS_VARRAY_* but not VMS_POINTER. Signed-off-by: Peter Maydell Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Damien Hedde Tested-by: Damien Hedde Message-id: 20190725163710.11703-3-peter.maydell@linaro.org --- include/migration/vmstate.h | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index ca68584eba4..c2bfa7a7f0c 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -227,8 +227,22 @@ extern const VMStateInfo vmstate_info_bitmap; extern const VMStateInfo vmstate_info_qtailq; #define type_check_2darray(t1,t2,n,m) ((t1(*)[n][m])0 - (t2*)0) +/* + * Check that type t2 is an array of type t1 of size n, + * e.g. if t1 is 'foo' and n is 32 then t2 must be 'foo[32]' + */ #define type_check_array(t1,t2,n) ((t1(*)[n])0 - (t2*)0) #define type_check_pointer(t1,t2) ((t1**)0 - (t2*)0) +/* + * type of element 0 of the specified (array) field of the type. + * Note that if the field is a pointer then this will return the + * pointed-to type rather than complaining. + */ +#define typeof_elt_of_field(type, field) typeof(((type *)0)->field[0]) +/* Check that field f in struct type t2 is an array of t1, of any size */ +#define type_check_varray(t1, t2, f) \ + (type_check(t1, typeof_elt_of_field(t2, f)) \ + + QEMU_BUILD_BUG_ON_ZERO(!QEMU_IS_ARRAY(((t2 *)0)->f))) #define vmstate_offset_value(_state, _field, _type) \ (offsetof(_state, _field) + \ @@ -253,6 +267,10 @@ extern const VMStateInfo vmstate_info_qtailq; vmstate_offset_array(_state, _field, uint8_t, \ sizeof(typeof_field(_state, _field))) +#define vmstate_offset_varray(_state, _field, _type) \ + (offsetof(_state, _field) + \ + type_check_varray(_type, _state, _field)) + /* In the macros below, if there is a _version, that means the macro's * field will be processed only if the version being received is >= * the _version specified. In general, if you add a new field, you @@ -347,7 +365,7 @@ extern const VMStateInfo vmstate_info_qtailq; .info = &(_info), \ .size = sizeof(_type), \ .flags = VMS_VARRAY_UINT32|VMS_MULTIPLY_ELEMENTS, \ - .offset = offsetof(_state, _field), \ + .offset = vmstate_offset_varray(_state, _field, _type), \ } #define VMSTATE_ARRAY_TEST(_field, _state, _num, _test, _info, _type) {\ @@ -376,7 +394,7 @@ extern const VMStateInfo vmstate_info_qtailq; .info = &(_info), \ .size = sizeof(_type), \ .flags = VMS_VARRAY_INT32, \ - .offset = offsetof(_state, _field), \ + .offset = vmstate_offset_varray(_state, _field, _type), \ } #define VMSTATE_VARRAY_INT32(_field, _state, _field_num, _version, _info, _type) {\ @@ -416,7 +434,7 @@ extern const VMStateInfo vmstate_info_qtailq; .info = &(_info), \ .size = sizeof(_type), \ .flags = VMS_VARRAY_UINT16, \ - .offset = offsetof(_state, _field), \ + .offset = vmstate_offset_varray(_state, _field, _type), \ } #define VMSTATE_VSTRUCT_TEST(_field, _state, _test, _version, _vmsd, _type, _struct_version) { \ @@ -520,7 +538,7 @@ extern const VMStateInfo vmstate_info_qtailq; .vmsd = &(_vmsd), \ .size = sizeof(_type), \ .flags = VMS_STRUCT|VMS_VARRAY_UINT8, \ - .offset = offsetof(_state, _field), \ + .offset = vmstate_offset_varray(_state, _field, _type), \ } /* a variable length array (i.e. _type *_field) but we know the @@ -573,7 +591,7 @@ extern const VMStateInfo vmstate_info_qtailq; .vmsd = &(_vmsd), \ .size = sizeof(_type), \ .flags = VMS_STRUCT|VMS_VARRAY_INT32, \ - .offset = offsetof(_state, _field), \ + .offset = vmstate_offset_varray(_state, _field, _type), \ } #define VMSTATE_STRUCT_VARRAY_UINT32(_field, _state, _field_num, _version, _vmsd, _type) { \ @@ -583,7 +601,7 @@ extern const VMStateInfo vmstate_info_qtailq; .vmsd = &(_vmsd), \ .size = sizeof(_type), \ .flags = VMS_STRUCT|VMS_VARRAY_UINT32, \ - .offset = offsetof(_state, _field), \ + .offset = vmstate_offset_varray(_state, _field, _type), \ } #define VMSTATE_STRUCT_VARRAY_ALLOC(_field, _state, _field_num, _version, _vmsd, _type) {\