LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Matthew Keenan <matt@opcode-solutions.com>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-kernel@vger.kernel.org,
	Andrew Morton <akpm@linux-foundation.org>,
	torvalds@linux-foundation.org, stable@kernel.org
Subject: Re: Linux 2.6.22.18
Date: Mon, 11 Feb 2008 11:31:25 +0000	[thread overview]
Message-ID: <1202729485.24584.5.camel@bazbox.opcode-solutions.com> (raw)
In-Reply-To: <20080211074346.GB23195@kroah.com>


On Sun, 2008-02-10 at 23:43 -0800, Greg Kroah-Hartman wrote:
> diff --git a/Makefile b/Makefile
> index 6a949eb..99c5e87 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1,7 +1,7 @@
>  VERSION = 2
>  PATCHLEVEL = 6
>  SUBLEVEL = 22
> -EXTRAVERSION = .17
> +EXTRAVERSION = .18
>  NAME = Holy Dancing Manatees, Batman!
>  
>  # *DOCUMENTATION*
> diff --git a/fs/splice.c b/fs/splice.c
> index e263d3b..dbbe267 100644
> --- a/fs/splice.c
> +++ b/fs/splice.c
> @@ -1182,6 +1182,9 @@ static int get_iovec_page_array(const struct iovec __user *iov,
>  		if (unlikely(!base))
>  			break;
>  
> +		if (!access_ok(VERIFY_READ, base, len))
> +			break;
> +
>  		/*
>  		 * Get this base offset and number of pages, then map
>  		 * in the user pages.

Maybe I'm missing something here, but is there are reason that the patch
for 2.6.22 differs from 2.6.2[34]? The "if(unlikely(!base))" is removed
in the latter.

Matt



  reply	other threads:[~2008-02-11 11:58 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-11  7:43 Greg Kroah-Hartman
2008-02-11  7:43 ` Greg Kroah-Hartman
2008-02-11 11:31   ` Matthew Keenan [this message]
2008-02-11 15:45     ` Greg KH
2008-02-12 17:48       ` Florian Weimer
2008-02-12 17:50         ` Greg KH
2008-02-11 16:32     ` Linus Torvalds

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1202729485.24584.5.camel@bazbox.opcode-solutions.com \
    --to=matt@opcode-solutions.com \
    --cc=akpm@linux-foundation.org \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@kernel.org \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: Linux 2.6.22.18' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).