summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-10-29 11:46:56 -0600
committerJens Axboe <jaxboe@fusionio.com>2010-11-10 14:40:42 +0100
commitf3f63c1c28bc861a931fac283b5bc3585efb8967 (patch)
tree79c05b76488d9595bbb365b8185842357f8b3eec /fs
parent9f864c80913467312c7b8690e41fb5ebd1b50e92 (diff)
downloadlinux-stable-f3f63c1c28bc861a931fac283b5bc3585efb8967.tar.gz
linux-stable-f3f63c1c28bc861a931fac283b5bc3585efb8967.tar.bz2
linux-stable-f3f63c1c28bc861a931fac283b5bc3585efb8967.zip
block: limit vec count in bio_kmalloc() and bio_alloc_map_data()
Reported-by: Dan Rosenberg <drosenberg@vsecurity.com> Cc: stable@kernel.org Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/bio.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/bio.c b/fs/bio.c
index 8abb2dfb2e7c..8317a2c106bc 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -370,6 +370,9 @@ struct bio *bio_kmalloc(gfp_t gfp_mask, int nr_iovecs)
{
struct bio *bio;
+ if (nr_iovecs > UIO_MAXIOV)
+ return NULL;
+
bio = kmalloc(sizeof(struct bio) + nr_iovecs * sizeof(struct bio_vec),
gfp_mask);
if (unlikely(!bio))
@@ -697,8 +700,12 @@ static void bio_free_map_data(struct bio_map_data *bmd)
static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count,
gfp_t gfp_mask)
{
- struct bio_map_data *bmd = kmalloc(sizeof(*bmd), gfp_mask);
+ struct bio_map_data *bmd;
+
+ if (iov_count > UIO_MAXIOV)
+ return NULL;
+ bmd = kmalloc(sizeof(*bmd), gfp_mask);
if (!bmd)
return NULL;