lkml.org 
[lkml]   [2014]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 3.10 12/27] x86-64, espfix: Dont leak bits 31:16 of %esp returning to 16-bit stack
On Wed, Aug 06, 2014 at 04:16:20PM +0100, Luis Henriques wrote:
> On Tue, Aug 05, 2014 at 11:14:04AM -0700, Greg Kroah-Hartman wrote:
> <...>
> > @@ -188,17 +193,21 @@ static void note_page(struct seq_file *m
> > /*
> > * Now print the actual finished series
> > */
> > - seq_printf(m, "0x%0*lx-0x%0*lx ",
> > - width, st->start_address,
> > - width, st->current_address);
> > -
> > - delta = (st->current_address - st->start_address) >> 10;
> > - while (!(delta & 1023) && unit[1]) {
> > - delta >>= 10;
> > - unit++;
> > + if (!st->marker->max_lines ||
> > + st->lines < st->marker->max_lines) {
> > + seq_printf(m, "0x%0*lx-0x%0*lx ",
> > + width, st->start_address,
> > + width, st->current_address);
> > +
> > + delta = (st->current_address - st->start_address) >> 10;
> > + while (!(delta & 1023) && unit[1]) {
> > + delta >>= 10;
> > + unit++;
> > + }
> > + seq_printf(m, "%9lu%c ", delta, *unit);
> > + printk_prot(m, st->current_prot, st->level);
> > }
> > - seq_printf(m, "%9lu%c ", delta, *unit);
> > - printk_prot(m, st->current_prot, st->level);
> > + st->lines++;
> >
> > /*
> > * We print markers for special areas of address space,
>
> Hmm... the original commit has a 2nd hunk here that does seem to be
> applicable to 3.10. Was this dropped accidentally or on purpose?

I don't remember at all, sorry. What is the hunk that I missed?

thanks,

greg k-h


\
 
 \ /
  Last update: 2014-08-06 18:01    [W:2.112 / U:1.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site