All of lore.kernel.org
 help / color / mirror / Atom feed
From: dyoung@redhat.com
To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
	d.hatayama@jp.fujitsu.com, bhe@redhat.com, vgoyal@redhat.com
Cc: kexec@lists.infradead.org, dyoung@redhat.com
Subject: [PATCH 2/2] [PATCH 2/2] proc-vmcore: wrong data type casting fix
Date: Fri, 11 Mar 2016 14:21:58 +0800	[thread overview]
Message-ID: <20160311062953.623220113@redhat.com> (raw)

[-- Attachment #1: 0002-proc-vmcore-wrong-data-type-casting-fix.patch --]
[-- Type: text/plain, Size: 1814 bytes --]

On i686 PAE enabled machine the contiguous physical area could be large
and it can cause triming down variables in below calculation in
read_vmcore() and mmap_vmcore():

	tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);

Then the real size passed down is not correct any more.
Suppose m->offset + m->size - *fpos being truncated to 0, buflen >0 then
we will get tsz = 0. It is of course not an expected result.

During out test there are two problems caused by it:
1) read_vmcore will refuse to continue so makedumpfile fails.
2) mmap_vmcore will trigger BUG_ON() in remap_pfn_range().

Use min_lt instead so that the variables are not truncated.

Signed-off-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Dave Young <dyoung@redhat.com>
---
 fs/proc/vmcore.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- linux.orig/fs/proc/vmcore.c
+++ linux/fs/proc/vmcore.c
@@ -231,7 +231,8 @@ static ssize_t __read_vmcore(char *buffe
 
 	list_for_each_entry(m, &vmcore_list, list) {
 		if (*fpos < m->offset + m->size) {
-			tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
+			tsz = (size_t)min_lt(m->offset + m->size - *fpos,
+					    buflen);
 			start = m->paddr + *fpos - m->offset;
 			tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
 			if (tmp < 0)
@@ -461,7 +462,7 @@ static int mmap_vmcore(struct file *file
 		if (start < m->offset + m->size) {
 			u64 paddr = 0;
 
-			tsz = min_t(size_t, m->offset + m->size - start, size);
+			tsz = (size_t)min_lt(m->offset + m->size - start, size);
 			paddr = m->paddr + start - m->offset;
 			if (vmcore_remap_oldmem_pfn(vma, vma->vm_start + len,
 						    paddr >> PAGE_SHIFT, tsz,



_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

WARNING: multiple messages have this Message-ID (diff)
From: dyoung@redhat.com
To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
	d.hatayama@jp.fujitsu.com, bhe@redhat.com, vgoyal@redhat.com
Cc: dyoung@redhat.com, kexec@lists.infradead.org
Subject: [PATCH 2/2] [PATCH 2/2] proc-vmcore: wrong data type casting fix
Date: Fri, 11 Mar 2016 14:21:58 +0800	[thread overview]
Message-ID: <20160311062953.623220113@redhat.com> (raw)

[-- Attachment #1: 0002-proc-vmcore-wrong-data-type-casting-fix.patch --]
[-- Type: text/plain, Size: 1668 bytes --]

On i686 PAE enabled machine the contiguous physical area could be large
and it can cause triming down variables in below calculation in
read_vmcore() and mmap_vmcore():

	tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);

Then the real size passed down is not correct any more.
Suppose m->offset + m->size - *fpos being truncated to 0, buflen >0 then
we will get tsz = 0. It is of course not an expected result.

During out test there are two problems caused by it:
1) read_vmcore will refuse to continue so makedumpfile fails.
2) mmap_vmcore will trigger BUG_ON() in remap_pfn_range().

Use min_lt instead so that the variables are not truncated.

Signed-off-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Dave Young <dyoung@redhat.com>
---
 fs/proc/vmcore.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- linux.orig/fs/proc/vmcore.c
+++ linux/fs/proc/vmcore.c
@@ -231,7 +231,8 @@ static ssize_t __read_vmcore(char *buffe
 
 	list_for_each_entry(m, &vmcore_list, list) {
 		if (*fpos < m->offset + m->size) {
-			tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
+			tsz = (size_t)min_lt(m->offset + m->size - *fpos,
+					    buflen);
 			start = m->paddr + *fpos - m->offset;
 			tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
 			if (tmp < 0)
@@ -461,7 +462,7 @@ static int mmap_vmcore(struct file *file
 		if (start < m->offset + m->size) {
 			u64 paddr = 0;
 
-			tsz = min_t(size_t, m->offset + m->size - start, size);
+			tsz = (size_t)min_lt(m->offset + m->size - start, size);
 			paddr = m->paddr + start - m->offset;
 			if (vmcore_remap_oldmem_pfn(vma, vma->vm_start + len,
 						    paddr >> PAGE_SHIFT, tsz,

             reply	other threads:[~2016-03-11  6:31 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-11  6:21 dyoung [this message]
2016-03-11  6:21 ` [PATCH 2/2] [PATCH 2/2] proc-vmcore: wrong data type casting fix dyoung
2016-03-11  7:19 ` Minfei Huang
2016-03-11  7:19   ` Minfei Huang
2016-03-11  7:48   ` Dave Young
2016-03-11  7:48     ` Dave Young

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=20160311062953.623220113@redhat.com \
    --to=dyoung@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=bhe@redhat.com \
    --cc=d.hatayama@jp.fujitsu.com \
    --cc=kexec@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=vgoyal@redhat.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.