* [PATCH] vmstat: fix offset calculation on void*
@ 2010-11-03 17:56 Wu Fengguang
2010-11-09 3:24 ` KOSAKI Motohiro
0 siblings, 1 reply; 2+ messages in thread
From: Wu Fengguang @ 2010-11-03 17:56 UTC (permalink / raw)
To: Linus Torvalds
Cc: Tetsuo Handa, mrubin@google.com, david@fromorbit.com,
axboe@kernel.dk, kosaki.motohiro@jp.fujitsu.com,
nickpiggin@yahoo.com.au, akpm@linux-foundation.org,
linux-kernel@vger.kernel.org
Fix regression introduced by commit 79da826aee6.
BUG: unable to handle kernel paging request at 07c06d16
IP: [<c050c336>] strnlen+0x6/0x20
Call Trace:
[<c050a249>] ? string+0x39/0xe0
[<c042be6b>] ? __wake_up_common+0x4b/0x80
[<c050afcc>] ? vsnprintf+0x1ec/0x380
[<c04b380e>] ? seq_printf+0x2e/0x60
[<c04829a6>] ? vmstat_show+0x26/0x30
[<c04b3bb6>] ? seq_read+0xa6/0x380
[<c04b3b10>] ? seq_read+0x0/0x380
[<c04d5d2f>] ? proc_reg_read+0x5f/0x90
[<c049c4a1>] ? vfs_read+0xa1/0x140
[<c04d5cd0>] ? proc_reg_read+0x0/0x90
[<c049c981>] ? sys_read+0x41/0x70
[<c0402bd0>] ? sysenter_do_call+0x12/0x26
CC: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
CC: Michael Rubin <mrubin@google.com>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
Hopefully Tetsuo can test it soon, thanks!
mm/vmstat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-2.6.orig/mm/vmstat.c 2010-11-04 01:49:12.000000000 +0800
+++ linux-2.6/mm/vmstat.c 2010-11-04 01:49:23.000000000 +0800
@@ -949,7 +949,7 @@ static void *vmstat_start(struct seq_fil
v[PGPGIN] /= 2; /* sectors -> kbytes */
v[PGPGOUT] /= 2;
#endif
- return m->private + *pos;
+ return (unsigned long *)m->private + *pos;
}
static void *vmstat_next(struct seq_file *m, void *arg, loff_t *pos)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] vmstat: fix offset calculation on void*
2010-11-03 17:56 [PATCH] vmstat: fix offset calculation on void* Wu Fengguang
@ 2010-11-09 3:24 ` KOSAKI Motohiro
0 siblings, 0 replies; 2+ messages in thread
From: KOSAKI Motohiro @ 2010-11-09 3:24 UTC (permalink / raw)
To: Wu Fengguang
Cc: kosaki.motohiro, Linus Torvalds, Tetsuo Handa, mrubin@google.com,
david@fromorbit.com, axboe@kernel.dk, nickpiggin@yahoo.com.au,
akpm@linux-foundation.org, linux-kernel@vger.kernel.org
> Fix regression introduced by commit 79da826aee6.
>
> BUG: unable to handle kernel paging request at 07c06d16
> IP: [<c050c336>] strnlen+0x6/0x20
>
> Call Trace:
> [<c050a249>] ? string+0x39/0xe0
> [<c042be6b>] ? __wake_up_common+0x4b/0x80
> [<c050afcc>] ? vsnprintf+0x1ec/0x380
> [<c04b380e>] ? seq_printf+0x2e/0x60
> [<c04829a6>] ? vmstat_show+0x26/0x30
> [<c04b3bb6>] ? seq_read+0xa6/0x380
> [<c04b3b10>] ? seq_read+0x0/0x380
> [<c04d5d2f>] ? proc_reg_read+0x5f/0x90
> [<c049c4a1>] ? vfs_read+0xa1/0x140
> [<c04d5cd0>] ? proc_reg_read+0x0/0x90
> [<c049c981>] ? sys_read+0x41/0x70
> [<c0402bd0>] ? sysenter_do_call+0x12/0x26
>
>
> CC: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
> CC: Michael Rubin <mrubin@google.com>
> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
> ---
>
> Hopefully Tetsuo can test it soon, thanks!
>
> mm/vmstat.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-2.6.orig/mm/vmstat.c 2010-11-04 01:49:12.000000000 +0800
> +++ linux-2.6/mm/vmstat.c 2010-11-04 01:49:23.000000000 +0800
> @@ -949,7 +949,7 @@ static void *vmstat_start(struct seq_fil
> v[PGPGIN] /= 2; /* sectors -> kbytes */
> v[PGPGOUT] /= 2;
> #endif
> - return m->private + *pos;
> + return (unsigned long *)m->private + *pos;
> }
>
> static void *vmstat_next(struct seq_file *m, void *arg, loff_t *pos)
Good catch!
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-09 3:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-03 17:56 [PATCH] vmstat: fix offset calculation on void* Wu Fengguang
2010-11-09 3:24 ` KOSAKI Motohiro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox