From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BC05C433DF for ; Fri, 19 Jun 2020 17:03:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD47E20732 for ; Fri, 19 Jun 2020 17:03:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592586200; bh=L17dXPmuNlCLuhUupfHZeKfAGhXDukgs88cXcfbXs0c=; h=Date:From:To:Cc:Subject:List-ID:From; b=IpUbub+lFVdCIa64sh7BEFWbjOJ3fpZ8mvwtxjNWLwOaGvdZpM5jZqNh5C6H0ShSY Ug2vsq+qdNHhr1zZ/C1ECsWQTanDFcRGlAvy35kp95jOyQg0cSJgtW8VDSvNwRDKOP tBb7H631NcRWwFJZMVbR7TjrzOW6xhXS+hfKMsp8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388057AbgFSRDT (ORCPT ); Fri, 19 Jun 2020 13:03:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:40034 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733192AbgFSRDT (ORCPT ); Fri, 19 Jun 2020 13:03:19 -0400 Received: from embeddedor (unknown [189.207.59.248]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 729BE20707; Fri, 19 Jun 2020 17:03:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592586198; bh=L17dXPmuNlCLuhUupfHZeKfAGhXDukgs88cXcfbXs0c=; h=Date:From:To:Cc:Subject:From; b=sc5f8P516WieS+1vxXmn/W06s7vLO4x+wv4jTbrH7xr5ooBJ4Fox0NvduzeJlT891 bzSmv6CvUf/aL+VXd+nb+eXWl3qoUWgIrBxj6wyJgV3naThzZ84LV6s93W8yq8QO1v bFJDpOfdAQXbS+RTeZKOsCXRwxkK61Wpo/Sfinfs= Date: Fri, 19 Jun 2020 12:08:43 -0500 From: "Gustavo A. R. Silva" To: Matt Porter , Alexandre Bounine , Andrew Morton Cc: linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH][next] rapidio: rio_mport_cdev: Use struct_size() helper Message-ID: <20200619170843.GA24923@embeddedor> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org 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. This issue was found with the help of Coccinelle and, audited and fixed manually. Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83 Signed-off-by: Gustavo A. R. Silva --- drivers/rapidio/devices/rio_mport_cdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c index 451608e960a1..3abbba8c2b5b 100644 --- a/drivers/rapidio/devices/rio_mport_cdev.c +++ b/drivers/rapidio/devices/rio_mport_cdev.c @@ -1710,8 +1710,7 @@ static int rio_mport_add_riodev(struct mport_cdev_priv *priv, if (rval & RIO_PEF_SWITCH) { rio_mport_read_config_32(mport, destid, hopcount, RIO_SWP_INFO_CAR, &swpinfo); - size += (RIO_GET_TOTAL_PORTS(swpinfo) * - sizeof(rswitch->nextdev[0])) + sizeof(*rswitch); + size += struct_size(rswitch, nextdev, RIO_GET_TOTAL_PORTS(swpinfo)); } rdev = kzalloc(size, GFP_KERNEL); -- 2.27.0