From patchwork Wed Aug 16 18:04:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 135841 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp425950vqi; Wed, 16 Aug 2023 20:08:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFjUND88HRz4+WYLc96jhyKqvVE53z5R1c3mXwSmqZ1yEVJbHq+moOtHOA4UPQbtSLSA6vZ X-Received: by 2002:a2e:a17b:0:b0:2b9:da28:c508 with SMTP id u27-20020a2ea17b000000b002b9da28c508mr2696261ljl.31.1692241698529; Wed, 16 Aug 2023 20:08:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692241698; cv=none; d=google.com; s=arc-20160816; b=w2FnJQUQ1M+urlnmXLrS7emRJ+83pondNon384kBwYN4mgxDMsP5t7NdFs/tynUO/O 9REkaGxZ6Q62BcaX72T4+kWQZdJ93qSwbLGGQeu5s2olDFkkvZwmi8XGiurQKytnic5l k0vv2GcYgUb1tWW4KpAgpyvAk9Uoh44xvLoTzYbcwjWnSOlj7TIQ9zHIrTztpTVwDuvr HdeZcmT1tzhBeo2qHMQav42xJR8xzJSz9NmiOQKkGU0K+bVnFSSHVD2wX+Sg0A8Kr7J0 kzJO92qm8QtIYp+Ck6Zs9+eBL4G43MyrC1fSgZEZJxkYg9QvntuKsSNRHs3lAbvgCKdQ T/PA== 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=LVTuAA9cgH1EjHBOOD3+dbH+rkzLKvgiqS3pI+fAGYQ=; fh=63k/2nxKYwSvIOBIQmA3QPdOmdr34lTUWYnuhuabpEI=; b=z81q3R7YI4Km+8N22ct6mghkpdEzOODAFvgkpbwjs3x1cr+i/wmjZSDMp9Pg2VtH+z aWon+WjfEMPgH9gcu5y4+gc8ovoL9WXcYYeqrzG0SBGOZw+Eo2kcrc030FT+DtIRgtFZ OPEr9ffivTH4eOYqY1w3wubG0vcLX5mVM+PZuPWO5AbZwF5CyEvY14b9YAZb+AtdOumY dzfkwNbsVeVPuDEY9Agi5q0CDpNOZ4AAJc7TC1r88ZDAshogphf9yae6Mo9g69WHkZzK 25D2WlKV3vCHs7Diz1EfyInKFwKXTgwenJT4LEwzxbVwZnryTP31H+rWT+U/05Af0qij xHeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=URUt50Lp; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l11-20020a170906938b00b0099bd6b14081si11771764ejx.927.2023.08.16.20.07.55; Wed, 16 Aug 2023 20:08:18 -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=URUt50Lp; 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 S1345350AbjHPSDL (ORCPT + 99 others); Wed, 16 Aug 2023 14:03:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345347AbjHPSDH (ORCPT ); Wed, 16 Aug 2023 14:03:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2B9210C0; Wed, 16 Aug 2023 11:03:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6F20961F66; Wed, 16 Aug 2023 18:03:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1956C433C8; Wed, 16 Aug 2023 18:03:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692208985; bh=VZCc7I2wrs8o5Tj4LQsDy02WJ+lFyAmZfvikJnnhvOg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=URUt50Lpu68AZjwzUK65AbwaSQMzaypOHt0B77/aYMGDuEvcrVRbCP1+MjGsLnBHW rzrOzJrT2weHVZqP8tm26Qd/4bIXcDmqiLZe2hrRijXVql6cwBrIIxUpsDXz+dsYBU 5cJb3E4/oK2SuTx8o3zmWvchiZHqLyzyjoUBoyqpT4o7hasfl+FkU2RbrdNKyzAWHT BWUtyLZzYstMWrB4xb2TRrxtWrtYkZ1QmyYJ3V6IEfpn9q5NdHvLA4XjO8PCcUJjdU XPzFthtDC41qhifOl7rC0jhRrqL78Asq6GZcISPt9FnNQ8K1q8OoJzfpauWfxnX3CV EBYQGtj5L6+lg== Date: Wed, 16 Aug 2023 12:04:06 -0600 From: "Gustavo A. R. Silva" To: Ben Skeggs , Karol Herbst , Lyude Paul , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH 1/2][next] nouveau/svm: Replace one-element array with flexible-array member in struct nouveau_svm Message-ID: <087a1c335228bd245192bbb2fb347c9af1be5750.1692208802.git.gustavoars@kernel.org> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774444031568073134 X-GMAIL-MSGID: 1774444031568073134 One-element and zero-length arrays are deprecated. So, replace one-element array in struct nouveau_svm with flexible-array member. This results in no differences in binary output. Link: https://github.com/KSPP/linux/issues/338 Signed-off-by: Gustavo A. R. Silva --- drivers/gpu/drm/nouveau/nouveau_svm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouveau/nouveau_svm.c index 186351ecf72f..00444ad82d18 100644 --- a/drivers/gpu/drm/nouveau/nouveau_svm.c +++ b/drivers/gpu/drm/nouveau/nouveau_svm.c @@ -67,7 +67,7 @@ struct nouveau_svm { struct nouveau_svmm *svmm; } **fault; int fault_nr; - } buffer[1]; + } buffer[]; }; #define FAULT_ACCESS_READ 0 @@ -1063,7 +1063,7 @@ nouveau_svm_init(struct nouveau_drm *drm) if (drm->client.device.info.family > NV_DEVICE_INFO_V0_PASCAL) return; - if (!(drm->svm = svm = kzalloc(sizeof(*drm->svm), GFP_KERNEL))) + if (!(drm->svm = svm = kzalloc(struct_size(drm->svm, buffer, 1), GFP_KERNEL))) return; drm->svm->drm = drm;