From a72f3f0d4f35eec4e6435fec4832d1b942adbbde Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Wed, 27 Feb 2013 17:03:17 -0800 Subject: [PATCH] --- yaml --- r: 359291 b: refs/heads/master c: c2c1b089b44b783bd50fae4bccaa6f367f92e492 h: refs/heads/master i: 359289: 0dc15e7b9192c1883a2cfd8ca7a9f011323a3114 359287: 7c5319e650a19a70ad24ff457ad4d662e1988561 v: v3 --- [refs] | 2 +- trunk/fs/proc/vmcore.c | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 2c258e7d2fbf..463eb8dd9d08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87ebdc00eeb474615496d5f10eed46709e25c707 +refs/heads/master: c2c1b089b44b783bd50fae4bccaa6f367f92e492 diff --git a/trunk/fs/proc/vmcore.c b/trunk/fs/proc/vmcore.c index 41dd018f72dd..b870f740ab5a 100644 --- a/trunk/fs/proc/vmcore.c +++ b/trunk/fs/proc/vmcore.c @@ -176,15 +176,15 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer, start = map_offset_to_paddr(*fpos, &vmcore_list, &curr_m); if (!curr_m) return -EINVAL; - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen) - tsz = buflen; - - /* Calculate left bytes in current memory segment. */ - nr_bytes = (curr_m->size - (start - curr_m->paddr)); - if (tsz > nr_bytes) - tsz = nr_bytes; while (buflen) { + tsz = min_t(size_t, buflen, PAGE_SIZE - (start & ~PAGE_MASK)); + + /* Calculate left bytes in current memory segment. */ + nr_bytes = (curr_m->size - (start - curr_m->paddr)); + if (tsz > nr_bytes) + tsz = nr_bytes; + tmp = read_from_oldmem(buffer, tsz, &start, 1); if (tmp < 0) return tmp; @@ -199,12 +199,6 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer, struct vmcore, list); start = curr_m->paddr; } - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen) - tsz = buflen; - /* Calculate left bytes in current memory segment. */ - nr_bytes = (curr_m->size - (start - curr_m->paddr)); - if (tsz > nr_bytes) - tsz = nr_bytes; } return acc; }