Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3653745pxb; Mon, 24 Jan 2022 14:31:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJxUjs+qO3Tm0v93Q4TjQ1kDWvqWvue/8y7hWVvnFrXAY0AaCzF1k+DkXE2DjeIQ706fmFJb X-Received: by 2002:a17:902:9893:b0:14a:c958:2c19 with SMTP id s19-20020a170902989300b0014ac9582c19mr15878299plp.39.1643063500567; Mon, 24 Jan 2022 14:31:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643063500; cv=none; d=google.com; s=arc-20160816; b=WRNwAh9/SnvDcjHdpz0TR8ChNcC89D4cZ/UFpL74UxfAVVcc1YJL8I7rmOpX3BQU5U 9uqXJe0J4iQI//q4bukycFe9BQ2bCgD4KNTue2eTkRET59Yluj/tLJiv3dwoSRUQ2+sy iQgcQAuucMzbvMT3nQJItB5aNwKjprIbgvt6wAsXd+QNrLQmDbwJ9WdZZaaL/TXVuzAv sUWCaYEx8O1vPUJ6xg65H/sVwsC69CLku0tpLw2K69Ogd89BO+w1QiDF9HXZWRNHnQOo 3BB7f0hH0TxIgq1g6E8WwjgPLr/77lL2qVasf6JG9uoMdUe4o6kRGT0M+exfEEyvV+37 5diw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=qqg/NRqf4H9h0BdjG7jdqzJxc1de2/55p5W1BdfPSRc=; b=NoiPz+gvWoC5EL01GZi6Pi5NhksGIJGy+fRWnJH9hqV6YPAOIdwrxQadgFZeHKMWw4 /ULcKLlk8J8LSEsGn+WFqfQbAUl4wLXvu5LL2zvzA/yfqrIk4xcqdtxhTj/C88t8FOHr VoT3leKNLjn2loxGFy48uHVJNiR3UhL5T8t7u1RqHkk6Bmk+kmQrOwg67Mi+eeq1T6wB IVMOKEEvs6KEVwtGf3FwI4IHXZE+aIqwx9HrNe1OD5t8EuDB4AEQffk1b2NRw8I6dm06 QZAIfQTinGg3FpTXaUkrQ+5424leLcx+WLszh6dTxzuyY3iluuxEgH6HwrlaRxs/C23j VLEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CmipDkkU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jx20si462770pjb.131.2022.01.24.14.31.28; Mon, 24 Jan 2022 14:31:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CmipDkkU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1587642AbiAXW3X (ORCPT + 99 others); Mon, 24 Jan 2022 17:29:23 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:47494 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346686AbiAXVhI (ORCPT ); Mon, 24 Jan 2022 16:37:08 -0500 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 ams.source.kernel.org (Postfix) with ESMTPS id B329AB8105C; Mon, 24 Jan 2022 21:37:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64061C340E8; Mon, 24 Jan 2022 21:37:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643060224; bh=p+HWmAwbx4PM1ahPU6LAvyTqNx07782m8kgyYrwLFT8=; h=Date:From:To:Cc:Subject:From; b=CmipDkkUgY3vXAQnEAtk1lzDgjA15xxFksaITPOHeCfSUazyZtXqWhPOVPaoHLGme nPkaSHZECQ0I9kfxljSD233eNJHIzxq4vLN01DUKt85n245kLxlzz1XxN3spNE6mJo /mRjP4iGQ9Qp5ZgjlDMn2oK5FpQ25JRnsOS6Wbw+RHmiWRNXdu4X8kZoNWvlwp+ZWK xsQEG0KA1E/Cmxdkp+xGLzsKh1ymkmHXbiGGlqIybuXExQ69xNuLOweAyaJP7zSsRh 6AGgKLdcZ36JOxVtxGiGwBZdi392cAKlYhgAtYVQQMtlW8NkepvPipzANj8R7L5LY1 Xc4wbV2+Mvk5w== Date: Mon, 24 Jan 2022 15:43:47 -0600 From: "Gustavo A. R. Silva" To: "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , Wei Liu , Dexuan Cui , "David S. Miller" , Jakub Kicinski Cc: linux-hyperv@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH][next] net: mana: Use struct_size() helper in mana_gd_create_dma_region() Message-ID: <20220124214347.GA24709@embeddedor> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make use of the struct_size() helper instead of an open-coded version, in order to avoid any potential type mistakes or integer overflows that, in the worst scenario, could lead to heap overflows. Also, address the following sparse warnings: drivers/net/ethernet/microsoft/mana/gdma_main.c:677:24: warning: using sizeof on a flexible structure Link: https://github.com/KSPP/linux/issues/174 Signed-off-by: Gustavo A. R. Silva --- drivers/net/ethernet/microsoft/mana/gdma_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c index 636dfef24a6c..49b85ca578b0 100644 --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c @@ -663,7 +663,7 @@ static int mana_gd_create_dma_region(struct gdma_dev *gd, struct gdma_context *gc = gd->gdma_context; struct hw_channel_context *hwc; u32 length = gmi->length; - u32 req_msg_size; + size_t req_msg_size; int err; int i; @@ -674,7 +674,7 @@ static int mana_gd_create_dma_region(struct gdma_dev *gd, return -EINVAL; hwc = gc->hwc.driver_data; - req_msg_size = sizeof(*req) + num_page * sizeof(u64); + req_msg_size = struct_size(req, page_addr_list, num_page); if (req_msg_size > hwc->max_req_msg_size) return -EINVAL; -- 2.27.0