2021-12-03 06:56:52

by Kees Cook

Subject: [PATCH] hugetlb/cgroup: Fix copy/paste array assignment

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 <[email protected]>
---
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

2021-12-03 07:44:21

by Muchun Song

Subject: Re: [PATCH] hugetlb/cgroup: Fix copy/paste array assignment

On Fri, Dec 3, 2021 at 2:56 PM Kees Cook <[email protected]> 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 <[email protected]>

Reviewed-by: Muchun Song <[email protected]>

Thanks.

2021-12-03 19:15:56

by Mike Kravetz

Subject: Re: [PATCH] hugetlb/cgroup: Fix copy/paste array assignment

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 <[email protected]>

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

2021-12-07 01:54:38

by Mina Almasry

Subject: Re: [PATCH] hugetlb/cgroup: Fix copy/paste array assignment

On Thu, Dec 2, 2021 at 10:56 PM Kees Cook <[email protected]> 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 <[email protected]>

Sorry about that and thanks for the fix!

Reviewed-by: Mina Almasry <[email protected]>

> ---
> 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
>