]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sg_start_req(): make sure that there's not too many elements in iovec
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 1 Aug 2015 17:25:59 +0000 (18:25 +0100)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 11 Aug 2015 08:57:29 +0000 (09:57 +0100)
commit 451a2886b6bf90e2fb378f7c46c655450fb96e81 upstream.

unfortunately, allowing an arbitrary 16bit value means a possibility of
overflow in the calculation of total number of pages in bio_map_user_iov() -
we rely on there being no more than PAGE_SIZE members of sum in the
first loop there.  If that sum wraps around, we end up allocating
too small array of pointers to pages and it's easy to overflow it in
the second loop.

X-Coverup: TINC (and there's no lumber cartel either)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
[bwh: s/MAX_UIOVEC/UIO_MAXIOV/. This was fixed upstream by commit
 fdc81f45e9f5 ("sg_start_req(): use import_iovec()"), but we don't have
 that function.]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/scsi/sg.c

index 791460b798f463756c17279cb6d76d4546de1ae7..2aa95c89b5bff44cd505dad189f688176ffdc7f2 100644 (file)
@@ -1693,6 +1693,9 @@ static int sg_start_req(Sg_request *srp, unsigned char *cmd)
                        md->from_user = 0;
        }
 
+       if (unlikely(iov_count > UIO_MAXIOV))
+               return -EINVAL;
+
        if (iov_count) {
                int len, size = sizeof(struct sg_iovec) * iov_count;
                struct iovec *iov;