Skip to content

Commit be31340

Browse files
compudjakpm00
authored andcommitted
mm: take into account mm_cid size for mm_struct static definitions
Both init_mm and efi_mm static definitions need to make room for the 2 mm_cid cpumasks. This fixes possible out-of-bounds accesses to init_mm and efi_mm. Add a space between # and define for the mm_alloc_cid() definition to make it consistent with the coding style used in the rest of this header file. Link: https://lkml.kernel.org/r/20251224173358.647691-4-mathieu.desnoyers@efficios.com Fixes: af7f588 ("sched: Introduce per-memory-map concurrency ID") Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Reviewed-by: Thomas Gleixner <tglx@kernel.org> Cc: Mark Brown <broonie@kernel.org> Cc: Aboorva Devarajan <aboorvad@linux.ibm.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Baolin Wang <baolin.wang@linux.alibaba.com> Cc: Christan König <christian.koenig@amd.com> Cc: Christian Brauner <brauner@kernel.org> Cc: Christoph Lameter <cl@linux.com> Cc: David Hildenbrand <david@redhat.com> Cc: David Rientjes <rientjes@google.com> Cc: Dennis Zhou <dennis@kernel.org> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: "Liam R . Howlett" <liam.howlett@oracle.com> Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Cc: Martin Liu <liumartin@google.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mateusz Guzik <mjguzik@gmail.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Miaohe Lin <linmiaohe@huawei.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Mike Rapoport <rppt@kernel.org> Cc: "Paul E. McKenney" <paulmck@kernel.org> Cc: Roman Gushchin <roman.gushchin@linux.dev> Cc: SeongJae Park <sj@kernel.org> Cc: Shakeel Butt <shakeel.butt@linux.dev> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Sweet Tea Dorminy <sweettea-kernel@dorminy.me> Cc: Tejun Heo <tj@kernel.org> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Wei Yang <richard.weiyang@gmail.com> Cc: Yu Zhao <yuzhao@google.com> Cc: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 6ac433f commit be31340

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

include/linux/mm_types.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,7 +1368,7 @@ extern struct mm_struct init_mm;
13681368

13691369
#define MM_STRUCT_FLEXIBLE_ARRAY_INIT \
13701370
{ \
1371-
[0 ... sizeof(cpumask_t)-1] = 0 \
1371+
[0 ... sizeof(cpumask_t) + MM_CID_STATIC_SIZE - 1] = 0 \
13721372
}
13731373

13741374
/* Pointer magic because the dynamic array size confuses some compilers. */
@@ -1500,7 +1500,7 @@ static inline int mm_alloc_cid_noprof(struct mm_struct *mm, struct task_struct *
15001500
mm_init_cid(mm, p);
15011501
return 0;
15021502
}
1503-
#define mm_alloc_cid(...) alloc_hooks(mm_alloc_cid_noprof(__VA_ARGS__))
1503+
# define mm_alloc_cid(...) alloc_hooks(mm_alloc_cid_noprof(__VA_ARGS__))
15041504

15051505
static inline void mm_destroy_cid(struct mm_struct *mm)
15061506
{
@@ -1514,6 +1514,8 @@ static inline unsigned int mm_cid_size(void)
15141514
return cpumask_size() + bitmap_size(num_possible_cpus());
15151515
}
15161516

1517+
/* Use 2 * NR_CPUS as worse case for static allocation. */
1518+
# define MM_CID_STATIC_SIZE (2 * sizeof(cpumask_t))
15171519
#else /* CONFIG_SCHED_MM_CID */
15181520
static inline void mm_init_cid(struct mm_struct *mm, struct task_struct *p) { }
15191521
static inline int mm_alloc_cid(struct mm_struct *mm, struct task_struct *p) { return 0; }
@@ -1522,6 +1524,7 @@ static inline unsigned int mm_cid_size(void)
15221524
{
15231525
return 0;
15241526
}
1527+
# define MM_CID_STATIC_SIZE 0
15251528
#endif /* CONFIG_SCHED_MM_CID */
15261529

15271530
struct mmu_gather;

0 commit comments

Comments
 (0)