mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-10-28 12:53:14 +01:00
pid: Replace struct pid 1-element array with flex-array
For pid namespaces, struct pid uses a dynamically sized array member, "numbers". This was implemented using the ancient 1-element fake flexible array, which has been deprecated for decades. Replace it with a C99 flexible array, refactor the array size calculations to use struct_size(), and address elements via indexes. Note that the static initializer (which defines a single element) works as-is, and requires no special handling. Without this, CONFIG_UBSAN_BOUNDS (and potentially CONFIG_FORTIFY_SOURCE) will trigger bounds checks: https://lore.kernel.org/lkml/20230517-bushaltestelle-super-e223978c1ba6@brauner Cc: Christian Brauner <[email protected]> Cc: Jan Kara <[email protected]> Cc: Jeff Xu <[email protected]> Cc: Andreas Gruenbacher <[email protected]> Cc: Daniel Verkamp <[email protected]> Cc: "Paul E. McKenney" <[email protected]> Cc: Jeff Xu <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Boqun Feng <[email protected]> Cc: Luis Chamberlain <[email protected]> Cc: Frederic Weisbecker <[email protected]> Reported-by: [email protected] [brauner: dropped unrelated changes and remove 0 with NULL cast] Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Christian Brauner <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
1 parent
112e7e2151
commit
b69f0aeb06
3 files changed
+7
-4
No files matched your search
+1
-1
@@ -67,7 +67,7 @@ struct pid
|
||||
/* wait queue for pidfd notifications */
|
||||
wait_queue_head_t wait_pidfd;
|
||||
struct rcu_head rcu;
|
||||
struct upid numbers[1];
|
||||
struct upid numbers[];
|
||||
};
|
||||
|
||||
extern struct pid init_struct_pid;
|
||||
|
||||
+5
-2
@@ -656,8 +656,11 @@ void __init pid_idr_init(void)
|
||||
|
||||
idr_init(&init_pid_ns.idr);
|
||||
|
||||
init_pid_ns.pid_cachep = KMEM_CACHE(pid,
|
||||
SLAB_HWCACHE_ALIGN | SLAB_PANIC | SLAB_ACCOUNT);
|
||||
init_pid_ns.pid_cachep = kmem_cache_create("pid",
|
||||
struct_size((struct pid *)NULL, numbers, 1),
|
||||
__alignof__(struct pid),
|
||||
SLAB_HWCACHE_ALIGN | SLAB_PANIC | SLAB_ACCOUNT,
|
||||
NULL);
|
||||
}
|
||||
|
||||
static struct file *__pidfd_fget(struct task_struct *task, int fd)
|
||||
|
||||
@@ -48,7 +48,7 @@ static struct kmem_cache *create_pid_cachep(unsigned int level)
|
||||
return kc;
|
||||
|
||||
snprintf(name, sizeof(name), "pid_%u", level + 1);
|
||||
len = sizeof(struct pid) + level * sizeof(struct upid);
|
||||
len = struct_size((struct pid *)NULL, numbers, level + 1);
|
||||
mutex_lock(&pid_caches_mutex);
|
||||
/* Name collision forces to do allocation under mutex. */
|
||||
if (!*pkc)
|
||||
|
||||
Reference in new issue
Block a user