linux-kernel - [PATCH] fs: fix bug about seq

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <4862136B.4010107@cn.fujitsu.com>
Date:	Wed, 25 Jun 2008 17:44:11 +0800
From:	biannm <biannm@...fujitsu.com>
To:	torvalds@...ux-foundation.org, akpm@...l.org
CC:	linux-kernel@...r.kernel.org
Subject: [PATCH] fs: fix bug about seq_read read nothing

When i used seq_file to read a proc file, i got a bug of seq_read.
If show() skip the first element or the size of first element is 0, 
and the size of second element is larger than the seq_file->size at 
the same time, seq_read will return 0, so nothing can be read from
the proc file.

So, if seq_read will return because it finds the element is biger 
than the m->buf, it must make sure either some date was filled to 
m->buf by show(), or some data was flushed to the user buf before, 
if not,it should increase the m->buf until it can read this element.


Signed-off-by: Bian Naimeng  <biannm@...fujitsu.com>

---
 fs/seq_file.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/fs/seq_file.c b/fs/seq_file.c
index 3f54dbd..ab1ed27 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -107,6 +107,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
 		if (!size)
 			goto Done;
 	}
+First_record:
 	/* we need at least one record in buffer */
 	while (1) {
 		pos = m->index;
@@ -145,8 +146,17 @@ Fill:
 		err = m->op->show(m, p);
 		if (m->count == m->size || err) {
 			m->count = offs;
-			if (likely(err <= 0))
+			if (err < 0)
 				break;
+			/* If no data flush to the user buf and nothing was read
+			 * by show() before,it should increase the m->buf until
+			 * it can read this element.
+			*/
+			if (err == 0 && m->count == 0 && copied == 0) {
+				m->index = next;
+				m->op->stop(m, p);
+				goto First_record;
+			}
 		}
 		pos = next;
 	}
-- 
1.5.4.rc3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/