Commit 8d73169f authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Li Lingfeng
Browse files

dm: limit the number of targets and parameter size area 

mainline inclusion
from mainline-v6.8-rc3
commit bd504bcfec41a503b32054da5472904b404341a4
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8YCAG
CVE: CVE-2024-23851

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bd504bcfec41a503b32054da5472904b404341a4



--------------------------------

The kvmalloc function fails with a warning if the size is larger than
INT_MAX. The warning was triggered by a syscall testing robot.

In order to avoid the warning, this commit limits the number of targets to
1048576 and the size of the parameter area to 1073741824.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>

Conflicts:
  drivers/md/dm-core.h
  drivers/md/dm-ioctl.c
  drivers/md/dm-table.c
  commit 91ccbbac ("dm ima: measure data on table load") add
  "dm ima.h";
  commit 8b211aac ("dm: add two stage requeue mechanism") add
  "struct dm_io;";
  commit 249bed82 ("dm ioctl: Avoid double-fetch of version") delete
  second copy of version;
  commit dbdcc906 ("dm ioctl: log an error if the ioctl structure is
  corrupted") add log of error when check data_size fail;
  commit 05bdb996 ("block: replace fmode_t with a block-specific type
  for block open flags") change the type of mode and num_targets.
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent 70c98c7d

drivers/md/dm-core.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include "dm.h"



#define DM_RESERVED_MAX_IOS		1024

#define DM_MAX_TARGETS			1048576

#define DM_MAX_TARGET_PARAMS		1024



struct dm_kobject_holder {

	struct kobject kobj;

drivers/md/dm-ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -1771,7 +1771,8 @@ static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl *param_kern 
	if (copy_from_user(param_kernel, user, minimum_data_size))

		return -EFAULT;



	if (param_kernel->data_size < minimum_data_size)

	if (unlikely(param_kernel->data_size < minimum_data_size) ||

	    unlikely(param_kernel->data_size > DM_MAX_TARGETS * DM_MAX_TARGET_PARAMS))

		return -EINVAL;



	secure_data = param_kernel->flags & DM_SECURE_DATA_FLAG;

drivers/md/dm-table.c

+7 −2
Original line number Diff line number Diff line
@@ -144,7 +144,12 @@ static int alloc_targets(struct dm_table *t, unsigned int num) 
int dm_table_create(struct dm_table **result, fmode_t mode,

		    unsigned num_targets, struct mapped_device *md)

{

	struct dm_table *t = kzalloc(sizeof(*t), GFP_KERNEL);

	struct dm_table *t;



	if (num_targets > DM_MAX_TARGETS)

		return -EOVERFLOW;



	t = kzalloc(sizeof(*t), GFP_KERNEL);



	if (!t)

		return -ENOMEM;
@@ -158,7 +163,7 @@ int dm_table_create(struct dm_table **result, fmode_t mode, 


	if (!num_targets) {

		kfree(t);

		return -ENOMEM;

		return -EOVERFLOW;

	}



	if (alloc_targets(t, num_targets)) {