Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp3682601rwd; Mon, 22 May 2023 18:44:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5rN+wvXqmK5JAw4OdWOPkqJb7JuWzgqceJQN2MksL63FYH5gGksdcdm83uhoT/fTCW5R2w X-Received: by 2002:a17:90a:7e02:b0:24e:102e:edbf with SMTP id i2-20020a17090a7e0200b0024e102eedbfmr11390160pjl.13.1684806294313; Mon, 22 May 2023 18:44:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684806294; cv=none; d=google.com; s=arc-20160816; b=jbsWt2QxV8TDYcpvsxkZ5EPDYfAies7g6dl6gltQzyCqUFVRUF1yRAuVOilkjOzTP5 DiFIbLODCvx28nHbrk8IPhMru2pSLI5+AT7cy/+x/9ju9NbqImnZemHAxQ45eOzmCvut tmBEmgyOR2WtIAKjKq+5R79P05fXKNj/0EnspzFk95xV24yv87GRSlT82WYxCcXT0ZKd TX548G+C68mScoSoa9JKC3hqFQ3QitSDuyi64t3/9qzp7Rhs/LEfF7l+NrCZrppvcC4g vpA7zlbor2Nkze2eGZ8MiKQt1KQK5X1H/hB/rLV5CMsuCjuEHTb/t3w2ThPrFAQj5xO5 92EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=HoscKaEKI1N5lQpIPffXVG2ttrag9ziKzIpewlFqvfw=; b=gI3O5xJN7npRjSgIp0omJ/Hrw02BMVWOWvRikvPz0aXEYP98VJ1sDdd8gLaEmYK225 f3YainFW6xNmXnkfaqSTXv+OhenXtcOQVUzZcqUflxCU4/l8PFqJPm3tR9xVwGnSaAjH L2Ziw2ezpEQRqsyj16oYq0jbXxFxYu7PnsRf1KjoodTcvC+8gdRmU+64pkJ2dUMlpjKg Mm7P9bI1w0Wv/HySu+AUCXDHltjejvMwv4wWkNTomS634vfOO7/VlwSj1a3DsMfe5Yzz n6omBuwVLumeW2ecGXwBU7lBDSxOqy9dYkfB94IgfhL1taEFOIDR2r9yihBBrOnTjLUY tPTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VfscvJfn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 24-20020a631258000000b0051b5c9dd1ffsi5608279pgs.66.2023.05.22.18.44.38; Mon, 22 May 2023 18:44:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VfscvJfn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234919AbjEWBeZ (ORCPT + 99 others); Mon, 22 May 2023 21:34:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232046AbjEWBeX (ORCPT ); Mon, 22 May 2023 21:34:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 445868E; Mon, 22 May 2023 18:34:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 79B4662D89; Tue, 23 May 2023 01:34:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13F37C433EF; Tue, 23 May 2023 01:34:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684805660; bh=BmXuXL/UqVGFg/YhKou0jzuTdayluGE9Gf9Xkd6BVDg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=VfscvJfn2ijg4fxrfryZM+rU1I0wnEP4MwW1JE7SHohU7DE9kVcS4HjalgALAffN7 8d3CKw/1b4BibMj/OUI75yQbJGV5kDG8GAs28Y/i/LwoUTP43GmqVQiin9IEBL7JT+ Xmz1mTEKTvhmGB7FPfUDnTcYPIfjOHqoBp7H+ZE4I80oyDsXaUFeXuZXZGUVinrSTf SFkCl0DqANpM+H5LZz7G2s0dorWeznI8JXT0BmR3lkJMtRGu7o4ICJLS7QaFsACoR2 bDsXg84vGUHdtQZ1C4lvtpAQzHyZZmdApp6/9eVz3rt80/+kYS/y8ZMtoiTbAqsfLr sJD7l6zWlkVNA== Date: Mon, 22 May 2023 19:35:12 -0600 From: "Gustavo A. R. Silva" To: Eric Farman , Matthew Rosato , Halil Pasic , Vineeth Vijayan , Peter Oberparleiter , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle Cc: linux-s390@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH 1/2][next] vfio/ccw: Replace one-element array with flexible-array member Message-ID: <3c10549ebe1564eade68a2515bde233527376971.1684805398.git.gustavoars@kernel.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org One-element arrays are deprecated, and we are replacing them with flexible array members instead. So, replace one-element array with flexible-array member in struct vfio_ccw_parent and refactor the the rest of the code accordingly. Link: https://github.com/KSPP/linux/issues/79 Link: https://github.com/KSPP/linux/issues/297 Signed-off-by: Gustavo A. R. Silva --- drivers/s390/cio/vfio_ccw_drv.c | 3 ++- drivers/s390/cio/vfio_ccw_private.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c index ff538a086fc7..57906a9c6324 100644 --- a/drivers/s390/cio/vfio_ccw_drv.c +++ b/drivers/s390/cio/vfio_ccw_drv.c @@ -171,7 +171,8 @@ static int vfio_ccw_sch_probe(struct subchannel *sch) return -ENODEV; } - parent = kzalloc(sizeof(*parent), GFP_KERNEL); + parent = kzalloc(sizeof(*parent) + sizeof(struct mdev_type *), + GFP_KERNEL); if (!parent) return -ENOMEM; diff --git a/drivers/s390/cio/vfio_ccw_private.h b/drivers/s390/cio/vfio_ccw_private.h index b441ae6700fd..b62bbc5c6376 100644 --- a/drivers/s390/cio/vfio_ccw_private.h +++ b/drivers/s390/cio/vfio_ccw_private.h @@ -79,7 +79,7 @@ struct vfio_ccw_parent { struct mdev_parent parent; struct mdev_type mdev_type; - struct mdev_type *mdev_types[1]; + struct mdev_type *mdev_types[]; }; /** -- 2.34.1