LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] splice: missing user pointer access verification (CVE-2008-0009/10)
       [not found]       ` <20080208160203.GB23197@kernel.dk>
@ 2008-02-08 16:49         ` Greg KH
  2008-02-08 17:48           ` Oliver Pinter
  0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2008-02-08 16:49 UTC (permalink / raw)
  To: torvalds; +Cc: Jens Axboe, Andrew Morton, cliph, linux-kernel

From: Jens Axboe <jens.axboe@oracle.com>

vmsplice_to_user() must always check the user pointer and length
with access_ok() before copying. Likewise, for the slow path of
copy_from_user_mmap_sem() we need to check that we may read from
the user region.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Cc: Wojciech Purczynski <cliph@research.coseinc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

Linus, this fixes a security hole in splice that is now public.  I have
it queued up for the .23 and .24 -stable releases as well.

 fs/splice.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/fs/splice.c b/fs/splice.c
index 4ee49e8..14e2262 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1179,6 +1179,9 @@ static int copy_from_user_mmap_sem(void *dst, const void __user *src, size_t n)
 {
 	int partial;
 
+	if (!access_ok(VERIFY_READ, src, n))
+		return -EFAULT;
+
 	pagefault_disable();
 	partial = __copy_from_user_inatomic(dst, src, n);
 	pagefault_enable();
@@ -1387,6 +1390,11 @@ static long vmsplice_to_user(struct file *file, const struct iovec __user *iov,
 			break;
 		}
 
+		if (unlikely(!access_ok(VERIFY_WRITE, base, len))) {
+			error = -EFAULT;
+			break;
+		}
+
 		sd.len = 0;
 		sd.total_len = len;
 		sd.flags = flags;
-- 
1.5.4.22.g7a20


-- 
Jens Axboe

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] splice: missing user pointer access verification (CVE-2008-0009/10)
  2008-02-08 16:49         ` [PATCH] splice: missing user pointer access verification (CVE-2008-0009/10) Greg KH
@ 2008-02-08 17:48           ` Oliver Pinter
  2008-02-08 18:09             ` Greg KH
  2008-02-08 18:10             ` Oliver Pinter
  0 siblings, 2 replies; 4+ messages in thread
From: Oliver Pinter @ 2008-02-08 17:48 UTC (permalink / raw)
  To: Greg KH; +Cc: torvalds, Jens Axboe, Andrew Morton, cliph, linux-kernel

greg it's for .22 or the splice is changed between .22 and .23?

On 2/8/08, Greg KH <greg@kroah.com> wrote:
> From: Jens Axboe <jens.axboe@oracle.com>
>
> vmsplice_to_user() must always check the user pointer and length
> with access_ok() before copying. Likewise, for the slow path of
> copy_from_user_mmap_sem() we need to check that we may read from
> the user region.
>
> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
> Cc: Wojciech Purczynski <cliph@research.coseinc.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
> ---
>
> Linus, this fixes a security hole in splice that is now public.  I have
> it queued up for the .23 and .24 -stable releases as well.
>
>  fs/splice.c |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/fs/splice.c b/fs/splice.c
> index 4ee49e8..14e2262 100644
> --- a/fs/splice.c
> +++ b/fs/splice.c
> @@ -1179,6 +1179,9 @@ static int copy_from_user_mmap_sem(void *dst, const
> void __user *src, size_t n)
>  {
>  	int partial;
>
> +	if (!access_ok(VERIFY_READ, src, n))
> +		return -EFAULT;
> +
>  	pagefault_disable();
>  	partial = __copy_from_user_inatomic(dst, src, n);
>  	pagefault_enable();
> @@ -1387,6 +1390,11 @@ static long vmsplice_to_user(struct file *file, const
> struct iovec __user *iov,
>  			break;
>  		}
>
> +		if (unlikely(!access_ok(VERIFY_WRITE, base, len))) {
> +			error = -EFAULT;
> +			break;
> +		}
> +
>  		sd.len = 0;
>  		sd.total_len = len;
>  		sd.flags = flags;
> --
> 1.5.4.22.g7a20
>
>
> --
> Jens Axboe
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>


-- 
Thanks,
Oliver

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] splice: missing user pointer access verification (CVE-2008-0009/10)
  2008-02-08 17:48           ` Oliver Pinter
@ 2008-02-08 18:09             ` Greg KH
  2008-02-08 18:10             ` Oliver Pinter
  1 sibling, 0 replies; 4+ messages in thread
From: Greg KH @ 2008-02-08 18:09 UTC (permalink / raw)
  To: Oliver Pinter; +Cc: torvalds, Jens Axboe, Andrew Morton, cliph, linux-kernel

On Fri, Feb 08, 2008 at 06:48:54PM +0100, Oliver Pinter wrote:
> greg it's for .22 or the splice is changed between .22 and .23?

splice changed for .23 and this only affects .23 and older kernels, so
.22 and older kernels do not have issues.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] splice: missing user pointer access verification (CVE-2008-0009/10)
  2008-02-08 17:48           ` Oliver Pinter
  2008-02-08 18:09             ` Greg KH
@ 2008-02-08 18:10             ` Oliver Pinter
  1 sibling, 0 replies; 4+ messages in thread
From: Oliver Pinter @ 2008-02-08 18:10 UTC (permalink / raw)
  To: Greg KH; +Cc: torvalds, Jens Axboe, Andrew Morton, cliph, linux-kernel

hmm, when I good see, this is not for .22, and it (vmsplice_to_user)
is came with .23

On 2/8/08, Oliver Pinter <oliver.pntr@gmail.com> wrote:
> greg it's for .22 or the splice is changed between .22 and .23?
>
> On 2/8/08, Greg KH <greg@kroah.com> wrote:
> > From: Jens Axboe <jens.axboe@oracle.com>
> >
> > vmsplice_to_user() must always check the user pointer and length
> > with access_ok() before copying. Likewise, for the slow path of
> > copy_from_user_mmap_sem() we need to check that we may read from
> > the user region.
> >
> > Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
> > Cc: Wojciech Purczynski <cliph@research.coseinc.com>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
> > ---
> >
> > Linus, this fixes a security hole in splice that is now public.  I have
> > it queued up for the .23 and .24 -stable releases as well.
> >
> >  fs/splice.c |    8 ++++++++
> >  1 files changed, 8 insertions(+), 0 deletions(-)
> >
> > diff --git a/fs/splice.c b/fs/splice.c
> > index 4ee49e8..14e2262 100644
> > --- a/fs/splice.c
> > +++ b/fs/splice.c
> > @@ -1179,6 +1179,9 @@ static int copy_from_user_mmap_sem(void *dst, const
> > void __user *src, size_t n)
> >  {
> >  	int partial;
> >
> > +	if (!access_ok(VERIFY_READ, src, n))
> > +		return -EFAULT;
> > +
> >  	pagefault_disable();
> >  	partial = __copy_from_user_inatomic(dst, src, n);
> >  	pagefault_enable();
> > @@ -1387,6 +1390,11 @@ static long vmsplice_to_user(struct file *file,
> const
> > struct iovec __user *iov,
> >  			break;
> >  		}
> >
> > +		if (unlikely(!access_ok(VERIFY_WRITE, base, len))) {
> > +			error = -EFAULT;
> > +			break;
> > +		}
> > +
> >  		sd.len = 0;
> >  		sd.total_len = len;
> >  		sd.flags = flags;
> > --
> > 1.5.4.22.g7a20
> >
> >
> > --
> > Jens Axboe
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at  http://www.tux.org/lkml/
> >
>
>
> --
> Thanks,
> Oliver
>


-- 
Thanks,
Oliver

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2008-02-08 18:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <0802051044200.29525@mjc.redhat.com>
     [not found] ` <20080205165301.1e0b8ad8.akpm@linux-foundation.org>
     [not found]   ` <20080206095510.GA15220@kernel.dk>
     [not found]     ` <20080207223146.GI19310@kroah.com>
     [not found]       ` <20080208160203.GB23197@kernel.dk>
2008-02-08 16:49         ` [PATCH] splice: missing user pointer access verification (CVE-2008-0009/10) Greg KH
2008-02-08 17:48           ` Oliver Pinter
2008-02-08 18:09             ` Greg KH
2008-02-08 18:10             ` Oliver Pinter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).