Merge pull request torvalds#20 from kounoike/fix-ubsan

fix UBSAN false positive
Kaz205 · Jan 12, 2025 · d9c3f9e · d9c3f9e
2 parents 70d1295 + f282d1c
commit d9c3f9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/driver/ptx_chrdev.c b/driver/ptx_chrdev.c
@@ -807,7 +807,7 @@ int ptx_chrdev_context_add_group(struct ptx_chrdev_context *chrdev_ctx,
 					    base, num,
 					    PTX_CHRDEV_MINOR_IN_USE);
 
-	group = kzalloc(sizeof(*group) + (sizeof(group->chrdev[0]) * (num - 1)),
+	group = kzalloc(sizeof(*group) + (sizeof(group->chrdev[0]) * num),
 			GFP_KERNEL);
 	if (!group) {
 		ret = -ENOMEM;

diff --git a/driver/ptx_chrdev.h b/driver/ptx_chrdev.h
@@ -100,7 +100,7 @@ struct ptx_chrdev_group {
 	void (*owner_kref_release)(struct kref *);
 	unsigned int minor_base;
 	unsigned int chrdev_num;
-	struct ptx_chrdev chrdev[1];
+	struct ptx_chrdev chrdev[];
 };
 
 #define PTX_CHRDEV_MINOR_FREE		0