dm: limit the number of targets and parameter size area
commit bd504bcfec
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>
[srish: Apply to stable branch linux-5.4.y]
Signed-off-by: Srish Srinivasan <srish.srinivasan@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d34a516f26
commit
86f4a49f32
|
@ -18,6 +18,8 @@
|
||||||
#include "dm.h"
|
#include "dm.h"
|
||||||
|
|
||||||
#define DM_RESERVED_MAX_IOS 1024
|
#define DM_RESERVED_MAX_IOS 1024
|
||||||
|
#define DM_MAX_TARGETS 1048576
|
||||||
|
#define DM_MAX_TARGET_PARAMS 1024
|
||||||
|
|
||||||
struct dm_kobject_holder {
|
struct dm_kobject_holder {
|
||||||
struct kobject kobj;
|
struct kobject kobj;
|
||||||
|
|
|
@ -1760,7 +1760,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))
|
if (copy_from_user(param_kernel, user, minimum_data_size))
|
||||||
return -EFAULT;
|
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;
|
return -EINVAL;
|
||||||
|
|
||||||
secure_data = param_kernel->flags & DM_SECURE_DATA_FLAG;
|
secure_data = param_kernel->flags & DM_SECURE_DATA_FLAG;
|
||||||
|
|
|
@ -184,7 +184,12 @@ static int alloc_targets(struct dm_table *t, unsigned int num)
|
||||||
int dm_table_create(struct dm_table **result, fmode_t mode,
|
int dm_table_create(struct dm_table **result, fmode_t mode,
|
||||||
unsigned num_targets, struct mapped_device *md)
|
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)
|
if (!t)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -199,7 +204,7 @@ int dm_table_create(struct dm_table **result, fmode_t mode,
|
||||||
|
|
||||||
if (!num_targets) {
|
if (!num_targets) {
|
||||||
kfree(t);
|
kfree(t);
|
||||||
return -ENOMEM;
|
return -EOVERFLOW;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (alloc_targets(t, num_targets)) {
|
if (alloc_targets(t, num_targets)) {
|
||||||
|
|
Loading…
Reference in New Issue