Re: Reading /proc/kcore causes a BUG()

[Nick Craig-Wood]

On Mon, Sep 07, 2009 at 03:14:22PM +0900, KAMEZAWA Hiroyuki wrote:
> On Mon, 7 Sep 2009 09:38:56 +0900
> KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> wrote:
> > > That's a lot of stuff for 2.6.31.  Is there some simple quickfix we can do?
> > > 
> > I don't like this patch. But here, my 1st version which wasn't sent out.
> > -Kame
> 
> Fixed warnings. (I confirmed this patch works well on x86-64.)
> ==
> To access vmalloc area which may have memory holes, copy_from_user is
> useful. By this, 
>  # cat /proc/kcore > /dev/null
> will not panic.
> 
> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
> ---
>  fs/proc/kcore.c |    8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> Index: linux-2.6.31-rc8/fs/proc/kcore.c
> ===================================================================
> --- linux-2.6.31-rc8.orig/fs/proc/kcore.c
> +++ linux-2.6.31-rc8/fs/proc/kcore.c
> @@ -361,7 +361,13 @@ read_kcore(struct file *file, char __use
>  				/* don't dump ioremap'd stuff! (TA) */
>  				if (m->flags & VM_IOREMAP)
>  					continue;
> -				memcpy(elf_buf + (vmstart - start),
> +				/*
> +				 * we may access memory holes, then use
> +				 * ex_table. checking return value just for
> +				 * avoid warnings.
> +				 */
> +				vmsize = __copy_from_user_inatomic(
> +					elf_buf + (vmstart - start),
>  					(char *)vmstart, vmsize);
>  			}
>  			read_unlock(&vmlist_lock);

I gave this patch a thrashing and it works fine for me too (Xen domU x86)

It would be great if we could have this quick fix for 2.6.31.

Perhaps it should also go out to 2.6.30-stable also?

I can confirm that this patch applies to 2.6.30.5 and fixes the problem there too.

-- 
Nick Craig-Wood <nick@xxxxxxxxxxxxxx> -- http://www.craig-wood.com/nick
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/