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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04A91C433F5 for ; Tue, 7 Dec 2021 01:55:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B8C646B0087; Mon, 6 Dec 2021 20:54:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B3BA36B0088; Mon, 6 Dec 2021 20:54:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2A146B0089; Mon, 6 Dec 2021 20:54:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0217.hostedemail.com [216.40.44.217]) by kanga.kvack.org (Postfix) with ESMTP id 95D246B0087 for ; Mon, 6 Dec 2021 20:54:38 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 589298248D52 for ; Tue, 7 Dec 2021 01:54:28 +0000 (UTC) X-FDA: 78889328616.02.DEBADDF Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) by imf13.hostedemail.com (Postfix) with ESMTP id 81E651044ABA for ; Tue, 7 Dec 2021 01:54:27 +0000 (UTC) Received: by mail-io1-f45.google.com with SMTP id c3so15242537iob.6 for ; Mon, 06 Dec 2021 17:54:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=8GCfs3UIWYheIdOcXQxitSGok4TtBWFHvnOhGvwh4LU=; b=EJPgQEgeubJfZbHmJT+ml4muCB9PM20VpdG8wGJniHE0bGeY3FD0kxAK49lCQDtaN/ c9RubZAQFKlfJft+x9GcWe2k8R4GLCJw8aC+uWAZujXFa+FQ2OHp6/GVBGyMoeDyOaxh YbQgyFIGjS0Kv9cK2z8rBcaH5o950iDBlH4BPFCdBi8Y/z4n6uAQQXyXln5423emXYaY WXtWlcablEGXFLzbJzWiKvlmC7bWD756LZ/7FPR/+YyEin0MNq45sHiiSHH3DKg9Bhuu IGOkO2r0avMCnseKZx7Gu8jEZ3D5IIVeT0tRml2C3G6f6cRQPz7nqLWuEntfYpz2S1TK l2VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=8GCfs3UIWYheIdOcXQxitSGok4TtBWFHvnOhGvwh4LU=; b=yx5DgMavqdMDNjG66v5GPXPUoj6/mWkcmV83ZXmF7z8UJ/JDYOzb3eNudinZ63uQq3 erVvZOu7levIO0QYIsZo/oSCXI/KhwLF1ixK1AYbLsh8ZIGnoJYWWfhStdeZ4KQKBR/E qo9T+EL5ZPv+AP6qfD8UsvVYL8CqXqR7iTpmnBqr/DM/BVe51QPY4ECdeyhldtnkpVYa udsobQhS5QySkAxjRcuTY8vZDYfoPQcCFW2PRClbo4+KSuXyl0CBC5qOgV3bhHR1h1+0 XC7gNCsoyFMEvhzhJXpsI8ht6l/9FlzUkCjvj+w5U4cu4ZWGFoTF+YnCS+fQYtJghClM GixQ== X-Gm-Message-State: AOAM531zvBaVFRWFVb8kOTL/KscIH6JD920iqD7zY8zFUW2PiOeoj6sN I6dHaFnNQSWebDpd+MhI4Wcbfkr7ISYaGmovBiVuyA== X-Google-Smtp-Source: ABdhPJyQjwGuVEpanwRxhs05NMKibfDWQCJJpGsPeH8foH3M53khXDQmMTwCV/a+WLqELyEiS/7cVz+m5Tuka3bF1/w= X-Received: by 2002:a6b:ea0a:: with SMTP id m10mr36636252ioc.91.1638842066584; Mon, 06 Dec 2021 17:54:26 -0800 (PST) MIME-Version: 1.0 References: <20211203065647.2819707-1-keescook@chromium.org> In-Reply-To: <20211203065647.2819707-1-keescook@chromium.org> From: Mina Almasry Date: Mon, 6 Dec 2021 17:54:15 -0800 Message-ID: Subject: Re: [PATCH] hugetlb/cgroup: Fix copy/paste array assignment To: Kees Cook Cc: Andrew Morton , Shakeel Butt , Muchun Song , Mike Kravetz , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-hardening@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 81E651044ABA X-Stat-Signature: eyfndpq9y34q4d8345n69gjyzd7y93fi Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=EJPgQEge; spf=pass (imf13.hostedemail.com: domain of almasrymina@google.com designates 209.85.166.45 as permitted sender) smtp.mailfrom=almasrymina@google.com; dmarc=pass (policy=reject) header.from=google.com X-HE-Tag: 1638842067-844858 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 Thu, Dec 2, 2021 at 10:56 PM Kees Cook wrote: > > Fix mismatched array assignment, reported by an -Warray-bounds build: > > mm/hugetlb_cgroup.c: In function '__hugetlb_cgroup_file_legacy_init': > mm/hugetlb_cgroup.c:850:35: error: array subscript 8 is above array bounds of 'struct cftype[8]' [-Werror=array-bounds ] > 850 | cft = &h->cgroup_files_dfl[8]; > | ~~~~~~~~~~~~~~~~~~~^~~ > In file included from mm/hugetlb_cgroup.c:23: > ./include/linux/hugetlb.h:625:23: note: while referencing 'cgroup_files_dfl' > 625 | struct cftype cgroup_files_dfl[8]; > | ^~~~~~~~~~~~~~~~ > > Fixes: e45f4726bcad ("hugetlb: add hugetlb.*.numa_stat file") > Signed-off-by: Kees Cook Sorry about that and thanks for the fix! Reviewed-by: Mina Almasry > --- > mm/hugetlb_cgroup.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c > index 9eebe8df3c39..f9942841df18 100644 > --- a/mm/hugetlb_cgroup.c > +++ b/mm/hugetlb_cgroup.c > @@ -847,7 +847,7 @@ static void __init __hugetlb_cgroup_file_legacy_init(int idx) > cft->read_u64 = hugetlb_cgroup_read_u64; > > /* Add the numa stat file */ > - cft = &h->cgroup_files_dfl[8]; > + cft = &h->cgroup_files_legacy[8]; > snprintf(cft->name, MAX_CFTYPE_NAME, "%s.numa_stat", buf); > cft->private = MEMFILE_PRIVATE(idx, 1); > cft->seq_show = hugetlb_cgroup_read_numa_stat; > -- > 2.30.2 >