On Sun, Feb 10, 2008 at 04:47:57PM +0200, Pekka J Enberg wrote:
quoted text
> From: Bastian Blank <bastian@waldi.eu.org>
>=20
> The commit 8811930dc74a503415b35c4a79d14fb0b408a361 ("splice: missing user
> pointer access verification") added access_ok() to copy_from_user_mmap_se=
m()
quoted text
> which only ensures we can copy the struct iovecs from userspace to the ke=
rnel
quoted text
> but we also must check whether we can access the actual memory region poi=
nted
quoted text
> to by the struct iovec to close the local root exploit.
>=20
> Cc: <stable@kernel.org>
> Cc: Jens Axboe <jens.axboe@oracle.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Bastian Blank <waldi@debian.org>

quoted text
> Index: linux-2.6/fs/splice.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
quoted text
> --- linux-2.6.orig/fs/splice.c
> +++ linux-2.6/fs/splice.c
> @@ -1237,6 +1237,9 @@ static int get_iovec_page_array(const st
>  		if (unlikely(!base))
>  			break;
> =20
> +		if (unlikely(!access_ok(VERIFY_READ, base, len)))
> +			break;
> +
>  		/*
>  		 * Get this base offset and number of pages, then map
>  		 * in the user pages.

--=20
Those who hate and fight must stop themselves -- otherwise it is not stoppe=
d.
		-- Spock, "Day of the Dove", stardate unknown