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=-10.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 C5F2AC433E0 for ; Tue, 4 Aug 2020 13:25:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 990542065C for ; Tue, 4 Aug 2020 13:25:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 990542065C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2A8DE8D0161; Tue, 4 Aug 2020 09:25:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 27FE38D0081; Tue, 4 Aug 2020 09:25:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1BC238D0161; Tue, 4 Aug 2020 09:25:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0023.hostedemail.com [216.40.44.23]) by kanga.kvack.org (Postfix) with ESMTP id 064F08D0081 for ; Tue, 4 Aug 2020 09:25:34 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id BFBBE181AEF0B for ; Tue, 4 Aug 2020 13:25:33 +0000 (UTC) X-FDA: 77112958146.29.duck15_5f04bfe26fa6 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id 8383018086E55 for ; Tue, 4 Aug 2020 13:25:29 +0000 (UTC) X-HE-Tag: duck15_5f04bfe26fa6 X-Filterd-Recvd-Size: 2603 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Tue, 4 Aug 2020 13:25:28 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 8EE21B5FB; Tue, 4 Aug 2020 13:25:43 +0000 (UTC) Date: Tue, 4 Aug 2020 15:25:26 +0200 From: Michal Hocko To: "Gustavo A. R. Silva" Cc: linux-kernel@vger.kernel.org, Johannes Weiner , Vladimir Davydov , Andrew Morton , cgroups@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 1/2][next] mm: memcontrol: Use flex_array_size() helper in memcpy() Message-ID: <20200804132526.GC7306@dhcp22.suse.cz> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 8383018086E55 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri 31-07-20 12:12:53, Gustavo A. R. Silva wrote: > 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. > > Also, remove unnecessary braces. I was not aware of this helper. The code looks slightly better. > Signed-off-by: Gustavo A. R. Silva Acked-by: Michal Hocko > --- > mm/memcontrol.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index e84c2b5596f2..bd7f972ceea4 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -4246,10 +4246,9 @@ static int __mem_cgroup_usage_register_event(struct mem_cgroup *memcg, > new->size = size; > > /* Copy thresholds (if any) to new array */ > - if (thresholds->primary) { > - memcpy(new->entries, thresholds->primary->entries, (size - 1) * > - sizeof(struct mem_cgroup_threshold)); > - } > + if (thresholds->primary) > + memcpy(new->entries, thresholds->primary->entries, > + flex_array_size(new, entries, size - 1)); > > /* Add new threshold */ > new->entries[size - 1].eventfd = eventfd; > -- > 2.27.0 -- Michal Hocko SUSE Labs