Skip to content

Commit

Permalink
dm: limit the number of targets and parameter size area
Browse files Browse the repository at this point in the history
commit bd504bc upstream.

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: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Mikulas Patocka authored and Greg Kroah-Hartman committed Feb 23, 2024
1 parent 626daab commit cd70175
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 2 additions & 0 deletions drivers/md/dm-core.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "dm-ima.h"

#define DM_RESERVED_MAX_IOS 1024
#define DM_MAX_TARGETS 1048576
#define DM_MAX_TARGET_PARAMS 1024

struct dm_io;

Expand Down
3 changes: 2 additions & 1 deletion drivers/md/dm-ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1941,7 +1941,8 @@ static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl *param_kern
minimum_data_size - sizeof(param_kernel->version)))
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)) {
DMERR("Invalid data size in the ioctl structure: %u",
param_kernel->data_size);
return -EINVAL;
Expand Down
9 changes: 7 additions & 2 deletions drivers/md/dm-table.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,12 @@ static int alloc_targets(struct dm_table *t, unsigned int num)
int dm_table_create(struct dm_table **result, blk_mode_t mode,
unsigned int 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;
Expand All @@ -144,7 +149,7 @@ int dm_table_create(struct dm_table **result, blk_mode_t mode,

if (!num_targets) {
kfree(t);
return -ENOMEM;
return -EOVERFLOW;
}

if (alloc_targets(t, num_targets)) {
Expand Down

0 comments on commit cd70175

Please sign in to comment.