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=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 E5C85C433E0 for ; Thu, 30 Jul 2020 03:11:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C570822B4B for ; Thu, 30 Jul 2020 03:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596078665; bh=H2NODBbkkSUD6I63me+UYQ1BgU7CvdVwALXoiuzsRNU=; h=Date:From:To:Cc:Subject:List-ID:From; b=jwfim6zrEEzXlDGVsJCjazNnSCZ7DURajcEj4xNs8TBHO8upH2dqKRn38E/8xrvRx NTclYSCFYzfAn8d4Gd31KJEhuPKUc3Ylim3FK4P9vMyRnK3T82mAYScUZN5ToWfIjB Kld281iwEOtm/sdjhYdwO29Y2uuXB03AGftNxdgY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728476AbgG3DLD (ORCPT ); Wed, 29 Jul 2020 23:11:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:55938 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728446AbgG3DLC (ORCPT ); Wed, 29 Jul 2020 23:11:02 -0400 Received: from embeddedor (187-162-31-110.static.axtel.net [187.162.31.110]) (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 7485C22B48; Thu, 30 Jul 2020 03:11:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596078662; bh=H2NODBbkkSUD6I63me+UYQ1BgU7CvdVwALXoiuzsRNU=; h=Date:From:To:Cc:Subject:From; b=RbZqcquCI0GudeIh3+q9R4S1n+n3KGUJ3JSutRSSooo1brOev6qu5ddM6TxjmqW1p qvB3Dd6T2TkJJefiZjlQMUScNKw503BN44Onz7f0PN7WVBzVM55JuuiM700JXRlrl5 Z9K1G4x3b0/ZdqmNrmpWJpnLjyEKiJ42iySmG6fY= Date: Wed, 29 Jul 2020 22:17:00 -0500 From: "Gustavo A. R. Silva" To: Jamal Hadi Salim , Cong Wang , Jiri Pirko , "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH][next] net/sched: act_pedit: Use flex_array_size() helper in memcpy() Message-ID: <20200730031700.GA23745@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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make use of the flex_array_size() helper to calculate the size of a flexible array member within an enclosing structure. This helper offers defense-in-depth against potential integer overflows, while at the same time makes it explicitly clear that we are dealing with a flexible array member. Signed-off-by: Gustavo A. R. Silva --- net/sched/act_pedit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index 66986db062ed..c158bfed86d5 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c @@ -436,8 +436,7 @@ static int tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a, return -ENOBUFS; spin_lock_bh(&p->tcf_lock); - memcpy(opt->keys, p->tcfp_keys, - p->tcfp_nkeys * sizeof(struct tc_pedit_key)); + memcpy(opt->keys, p->tcfp_keys, flex_array_size(opt, keys, p->tcfp_nkeys)); opt->index = p->tcf_index; opt->nkeys = p->tcfp_nkeys; opt->flags = p->tcfp_flags; -- 2.27.0