Message-ID: <401d58c4-6ba8-b0c8-2ee6-0312fc6be57c@oracle.com>
Date:   Fri, 3 Dec 2021 11:15:37 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.0
Subject: Re: [PATCH] hugetlb/cgroup: Fix copy/paste array assignment
Content-Language: en-US
To:     Kees Cook <keescook@chromium.org>,
        Mina Almasry <almasrymina@google.com>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Shakeel Butt <shakeelb@google.com>,
        Muchun Song <songmuchun@bytedance.com>,
        linux-kernel@vger.kernel.org, linux-mm@kvack.org,
        linux-hardening@vger.kernel.org
References: <20211203065647.2819707-1-keescook@chromium.org>
From:   Mike Kravetz <mike.kravetz@oracle.com>
In-Reply-To: <20211203065647.2819707-1-keescook@chromium.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MUladEVCK1BBampTeXg3eGEyMzVWZ1RqbWtaenJESnNvUkhFOWx2U0JPUkdJ?=
 =?utf-8?B?clNPcjR6bmE1V3FxWEk3alBNSlFlQlQwbCt4TzFYQkRNV25OMk1CWVc5eHgz?=
 =?utf-8?B?WjVwNzg3NGZLaTd6MTZXNi9VZlBweGRzOXVoYW85L2xvVTIyaUlJYTVHeDM0?=
 =?utf-8?B?akNHdks2LzVYVmlvMzkwQzlVQVU4OUIwVk9BVzg1a2lUTjE3T0ZDOVI5M0xN?=
 =?utf-8?B?dFhvS3prdy9HYm4waHhza2NTWXlhWno4cW8yUnpCcWdPdFc2YkRCcXpKZzd0?=
 =?utf-8?B?NG5reFIyWndaWTgxZ3ZJSjFDZkI3bDFHOXp6OFdJbkVGanRaV0haQ1BISXpj?=
 =?utf-8?B?eDZRMFdNVG5YVDJKajZ6WFN1Z1FiWVZ5MEF0VE11dUt5VmNQdVByWldSV25Q?=
 =?utf-8?B?VW1QM2E5SjJITFl6Yk1aOE83K0tTK3FUQWVmbS8rVjZ3TG9EQkp2eWk0Yldz?=
 =?utf-8?B?c3hJMnlmMHhtTnNRL0hTb3MzQUttMEtIR1kyOXJsaTRHUnYrWE9UQkd3aGIx?=
 =?utf-8?B?SFphK1BjNHZUdkU4QngvRU1oSFpBU1dUQ21ZaEpNYmdNRjB4OG42QmY2ZWFG?=
 =?utf-8?B?YytqUU9lWHVYaGZiUG5FTHduYmk0Z2dJRVNrNnZML25pYkF2WStiMndycWly?=
 =?utf-8?B?WkZyYnV2c2U5MEljbk5lZ0RhZy9pRU9TYkx0YlBCU014YUF3VFZDcE1qcm9r?=
 =?utf-8?B?N2dJaDVxTGpqcnBpM2d6S0JJaE0vZHFraDVxRHhLMjRocFE3bDFPRlc2dzJi?=
 =?utf-8?B?VXY4TTQ2a1BEQkNlOThBdkIxMUFXTkJpcnR0MmlRdEdvaktlMUw1NXpwK1FC?=
 =?utf-8?B?SnBjZTA5S0pDT1I3Q2lBRS9BOEk0WklkRktRTGVRQlpLc1haL3dqanVNWXgz?=
 =?utf-8?B?cUdJQUswU210U2RPMlJxcElQaUw5emZrdFRpWVZ4RnlLNjdYb0greXlMSzFv?=
 =?utf-8?B?bTUxcklaYlk3c2JOeUR5elV5MWNIRmMrYUlHdnB1aEJGVmdzaDJuTk50cVB0?=
 =?utf-8?B?MWpOdFBjT1I1dXM4RzdXTExtY3RybFRqQThiTURoV2x4cnZaMzVLckxDanUy?=
 =?utf-8?B?OCtXbmp0OU41dlJwaHFIUGRBM3YvTWN0OGwvR2pkc2xhQzBEenNwbmlCZzl5?=
 =?utf-8?B?SjIrMkxSYjlzM1JKaEtoNHNtUjRJSWJyQTBhb2p1bVhTYmVwT0I0OUlTWmtI?=
 =?utf-8?B?T2UrK0xuOFB4N2pMTUhmYmhURUF3ZGZHV3o4ZnQ4eVRZa1NOdG5CNURuQ2tr?=
 =?utf-8?B?MXhSeXVWdUJPWmxzYjV4RUpaU3p5YmNsd1VGWVBhZkFZeFgxUXVEU0xzRmto?=
 =?utf-8?B?VmQxcU5DR2lCeUcyb1dOWVpRQkUvQTdPbnVNeUNQZCtsV241WmtPZmxpUjBG?=
 =?utf-8?B?NmFBSnJyTlJHQlpVaGNLK05aRWpyMi8rZVVQc25jNjRidzBEMFRhUzRyYkow?=
 =?utf-8?B?Q3c0djRyQWkvd05sOXg5NmdzQzc1ekpqZVdmWE1GSmNMTTFSdmJMM3k5czZx?=
 =?utf-8?B?aEd0YjFTd2RuTnN0QzM3OWlYWTljK3ZIUzZxc3d6T0lqZHdja2Uyb0dZVFFv?=
 =?utf-8?B?ZkUvS1RhNnEwUE81QisxdjdNNDNFT3l1T1VwSS9aRlJwQ3hQb2ZadE0va0xG?=
 =?utf-8?B?bWZRNW9NK0k5K3JzZHViWlF3UmNiSW9taUpRMWtoREZlOWJYeG53bXBLSW84?=
 =?utf-8?B?MUxIYUE1Rk9TUlpZK1loWVFMRnVBbXY4amFzamdUeXBXeDBRdW5vemx2TFNo?=
 =?utf-8?B?RW5YS1VJMkRFQTRzUHVqRkJrRndmZ0VxZ0IyMG9WUXJyU0RkcEdYbUFZU3RS?=
 =?utf-8?B?ZERkRGJTR2ZsYU5FTVBhOXJVQjdia3RVb0puM1ZGMWN5c2FMQVZuTXl6bm1k?=
 =?utf-8?B?OWtSVkwvQjBKVVo3WDNXWWlrMGtBSElIK01IbWZUMHZxbVJHUldRZWQ1SzJq?=
 =?utf-8?B?QkZZN204eUlzbEpGQ09nY2Y4RUNoN3J1RFM3bmt6dWg4WUY1RWQ0djdnRWFv?=
 =?utf-8?B?Q3VQSU9SYTRpRzU4bWRQN2Nmd0UwaXI1dDVob2lUZnh5ZGRJOGYveUZsWmNC?=
 =?utf-8?B?OFQyTERuSG9iMUFNY0VoVjk4M3VSbXBtZVpTYnNmUnJyVkphMUk2N1V2a2tK?=
 =?utf-8?B?RkRKWXh4Ymt4N2JFQTZwUjZ6TEpBemZFYVJ6Q2pQcWIvK3QwTkJ6UVR4WFlS?=
 =?utf-8?Q?dIkyZw1i8e5EgSgD6PrlLZM=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 65b6681e-79a9-4a07-6175-08d9b6914b10
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2021 19:15:39.7076
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 9/Hn4UHQ5K8ZBL7GGBEtcTxuJZdYwTt9ZA++EFxhB1Yfbw5NCb6v25bUeUQOZASxSNIcWwG/Ie+LuQk6lDiLhQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4432
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10187 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 malwarescore=0
 spamscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2112030123
X-Proofpoint-GUID: Q9J-4Y8dLmELFR4iZZrKYMQIr8UyT80M
X-Proofpoint-ORIG-GUID: Q9J-4Y8dLmELFR4iZZrKYMQIr8UyT80M
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 12/2/21 22:56, 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 <keescook@chromium.org>

Thank you Kees (and Muchun)!

I believe this is just in Andrew's tree and as a result linux-next right now.
Perhaps Andrew can just squash this and ("hugetlb: Fix spelling mistake
"hierarichal" -> "hierarchical"") with the original?

The Fixes hash will change.
-- 
Mike Kravetz