From: Dave Jones <davej@redhat.com>
To: Sasha Levin <sasha.levin@oracle.com>
Cc: linux-fsdevel <linux-fsdevel@vger.kernel.org>,
Al Viro <viro@ZenIV.linux.org.uk>,
LKML <linux-kernel@vger.kernel.org>, Greg KH <greg@kroah.com>
Subject: Re: fs,seq_file: huge allocations for seq file reads
Date: Tue, 8 Apr 2014 10:49:43 -0400 [thread overview]
Message-ID: <20140408144943.GA6165@redhat.com> (raw)
In-Reply-To: <53440B8B.1010304@oracle.com>
On Tue, Apr 08, 2014 at 10:45:31AM -0400, Sasha Levin wrote:
> It seems that when we attempt to read huge chunks of data from a seq file
> there would be no check for the size being read, leading to the kernel
> attempting to allocate huge chunks of data internally.
>
> As far as I remember, there was a PAGE_SIZE limitation on those, but I'm
> not certain about that. Could someone please confirm it?
I've had this diff sitting around for a while to figure out which
seq_file we're talking about. I think Al wrote it, I forget..
diff --git a/fs/seq_file.c b/fs/seq_file.c
index 1d641bb108d2..e3ca909c8fea 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -82,7 +82,7 @@ int seq_open(struct file *file, const struct seq_operations *op)
}
EXPORT_SYMBOL(seq_open);
-static int traverse(struct seq_file *m, loff_t offset)
+static int traverse(struct file *file, struct seq_file *m, loff_t offset)
{
loff_t pos = 0, index;
int error = 0;
@@ -137,6 +137,13 @@ Eoverflow:
m->op->stop(m, p);
kfree(m->buf);
m->count = 0;
+ if ((m->size <<= 1) >= (PAGE_SIZE << 4)) {
+ printk(KERN_ERR "traverse on %s. Size: %ld\n",
+ file->f_path.dentry->d_name.name,
+ (unsigned long) (m->size));
+ m->buf = NULL;
+ return -ENOMEM;
+ }
m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
return !m->buf ? -ENOMEM : -EAGAIN;
}
@@ -176,7 +183,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
/* Don't assume *ppos is where we left it */
if (unlikely(*ppos != m->read_pos)) {
- while ((err = traverse(m, *ppos)) == -EAGAIN)
+ while ((err = traverse(file, m, *ppos)) == -EAGAIN)
;
if (err) {
/* With prejudice... */
@@ -192,6 +199,14 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
/* grab buffer if we didn't have one */
if (!m->buf) {
+ if ((m->size <<= 1) >= (PAGE_SIZE << 4)) {
+ printk(KERN_ERR "seq_read on %s. Size: %ld\n",
+ file->f_path.dentry->d_name.name,
+ (unsigned long) (m->size));
+ m->buf = NULL;
+ goto Enomem;;
+ }
+
m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
if (!m->buf)
goto Enomem;
@@ -234,6 +249,15 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
m->op->stop(m, p);
kfree(m->buf);
m->count = 0;
+
+ if ((m->size <<= 1) >= (PAGE_SIZE << 4)) {
+ printk(KERN_ERR "seq_read on %s. Size: %ld\n",
+ file->f_path.dentry->d_name.name,
+ (unsigned long) (m->size));
+ m->buf = NULL;
+ goto Enomem;;
+ }
+
m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
if (!m->buf)
goto Enomem;
@@ -316,7 +340,7 @@ loff_t seq_lseek(struct file *file, loff_t offset, int whence)
break;
retval = offset;
if (offset != m->read_pos) {
- while ((retval = traverse(m, offset)) == -EAGAIN)
+ while ((retval = traverse(file, m, offset)) == -EAGAIN)
;
if (retval) {
/* with extreme prejudice... */
next prev parent reply other threads:[~2014-04-08 14:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-08 14:45 fs,seq_file: huge allocations for seq file reads Sasha Levin
2014-04-08 14:49 ` Dave Jones [this message]
2014-04-08 14:51 ` Sasha Levin
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=20140408144943.GA6165@redhat.com \
--to=davej@redhat.com \
--cc=greg@kroah.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sasha.levin@oracle.com \
--cc=viro@ZenIV.linux.org.uk \
/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.