From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
Chris Wedgwood <reviews@ml.cw.f00f.org>,
Michael Krufky <mkrufky@linuxtv.org>,
Chuck Ebbert <cebbert@redhat.com>,
Domenico Andreoli <cavokz@gmail.com>, Willy Tarreau <w@1wt.eu>,
Rodrigo Rubira Branco <rbranco@la.checkpoint.com>,
Jake Edge <jake@lwn.net>, Eugene Teo <eteo@redhat.com>,
torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk, Eric Biederman <ebiederm@xmission.com>,
Paul Turner <pjt@google.com>,
Alexey Dobriyan <adobriyan@gmail.com>,
Al Viro <viro@zeniv.linux.org.uk>
Subject: [patch 33/56] seq_file: move traverse so it can be used from seq_read
Date: Tue, 10 Feb 2009 16:25:24 -0800 [thread overview]
Message-ID: <20090211002524.GH14660@kroah.com> (raw)
In-Reply-To: <20090211002328.GA14660@kroah.com>
[-- Attachment #1: seq_file-move-traverse-so-it-can-be-used-from-seq_read.patch --]
[-- Type: text/plain, Size: 3532 bytes --]
2.6.27-stable review patch. If anyone has any objections, please let us know.
------------------
From: Eric Biederman <ebiederm@xmission.com>
commit 33da8892a2f9e7d4b2d9a35fc80833ba2d2b1aa6 upstream.
In 2.6.25 some /proc files were converted to use the seq_file
infrastructure. But seq_files do not correctly support pread(), which
broke some usersapce applications.
To handle pread correctly we can't assume that f_pos is where we left it
in seq_read. So move traverse() so that we can eventually use it in
seq_read and do thus some day support pread().
Signed-off-by: Eric Biederman <ebiederm@xmission.com>
Cc: Paul Turner <pjt@google.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
fs/seq_file.c | 114 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 57 insertions(+), 57 deletions(-)
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -54,6 +54,63 @@ int seq_open(struct file *file, const st
}
EXPORT_SYMBOL(seq_open);
+static int traverse(struct seq_file *m, loff_t offset)
+{
+ loff_t pos = 0, index;
+ int error = 0;
+ void *p;
+
+ m->version = 0;
+ index = 0;
+ m->count = m->from = 0;
+ if (!offset) {
+ m->index = index;
+ return 0;
+ }
+ if (!m->buf) {
+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
+ if (!m->buf)
+ return -ENOMEM;
+ }
+ p = m->op->start(m, &index);
+ while (p) {
+ error = PTR_ERR(p);
+ if (IS_ERR(p))
+ break;
+ error = m->op->show(m, p);
+ if (error < 0)
+ break;
+ if (unlikely(error)) {
+ error = 0;
+ m->count = 0;
+ }
+ if (m->count == m->size)
+ goto Eoverflow;
+ if (pos + m->count > offset) {
+ m->from = offset - pos;
+ m->count -= m->from;
+ m->index = index;
+ break;
+ }
+ pos += m->count;
+ m->count = 0;
+ if (pos == offset) {
+ index++;
+ m->index = index;
+ break;
+ }
+ p = m->op->next(m, p, &index);
+ }
+ m->op->stop(m, p);
+ return error;
+
+Eoverflow:
+ m->op->stop(m, p);
+ kfree(m->buf);
+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
+ return !m->buf ? -ENOMEM : -EAGAIN;
+}
+
/**
* seq_read - ->read() method for sequential files.
* @file: the file to read from
@@ -186,63 +243,6 @@ Efault:
}
EXPORT_SYMBOL(seq_read);
-static int traverse(struct seq_file *m, loff_t offset)
-{
- loff_t pos = 0, index;
- int error = 0;
- void *p;
-
- m->version = 0;
- index = 0;
- m->count = m->from = 0;
- if (!offset) {
- m->index = index;
- return 0;
- }
- if (!m->buf) {
- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
- if (!m->buf)
- return -ENOMEM;
- }
- p = m->op->start(m, &index);
- while (p) {
- error = PTR_ERR(p);
- if (IS_ERR(p))
- break;
- error = m->op->show(m, p);
- if (error < 0)
- break;
- if (unlikely(error)) {
- error = 0;
- m->count = 0;
- }
- if (m->count == m->size)
- goto Eoverflow;
- if (pos + m->count > offset) {
- m->from = offset - pos;
- m->count -= m->from;
- m->index = index;
- break;
- }
- pos += m->count;
- m->count = 0;
- if (pos == offset) {
- index++;
- m->index = index;
- break;
- }
- p = m->op->next(m, p, &index);
- }
- m->op->stop(m, p);
- return error;
-
-Eoverflow:
- m->op->stop(m, p);
- kfree(m->buf);
- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
- return !m->buf ? -ENOMEM : -EAGAIN;
-}
-
/**
* seq_lseek - ->llseek() method for sequential files.
* @file: the file in question
next prev parent reply other threads:[~2009-02-11 0:39 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090211001439.873435357@mini.kroah.org>
2009-02-11 0:23 ` [patch 00/56] 2.6.27-stable review Greg KH
2009-02-11 0:24 ` [patch 01/56] ACPI: dock: Dont eval _STA on every show_docked sysfs read Greg KH
2009-02-11 0:24 ` [patch 02/56] ACPI: Enable bit 11 in _PDC to advertise hw coord Greg KH
2009-02-11 0:24 ` [patch 03/56] agp/intel: add support for G41 chipset Greg KH
2009-02-11 0:24 ` [patch 04/56] agp/intel: Fix broken ® symbol in device name Greg KH
2009-02-11 0:24 ` [patch 05/56] agp/intel: Reduce extraneous PCI posting reads during init Greg KH
2009-02-11 2:13 ` Keith Packard
2009-02-11 2:40 ` Greg KH
2009-02-11 0:24 ` [patch 06/56] e1000: fix bug with shared interrupt during reset Greg KH
2009-02-11 0:24 ` [patch 07/56] e1000: Fix PCI enable to honor the need_ioport flag Greg KH
2009-02-11 0:24 ` [patch 08/56] eeepc-laptop: fix oops when changing backlight brightness during eeepc-laptop init Greg KH
2009-02-11 0:24 ` [patch 09/56] md: Ensure an md array never has too many devices Greg KH
2009-02-11 0:24 ` [patch 10/56] module: remove over-zealous check in __module_get() Greg KH
2009-02-11 0:24 ` [patch 11/56] prevent kprobes from catching spurious page faults Greg KH
2009-02-11 0:24 ` [patch 12/56] sgi-xp: fix writing past the end of kzalloc()d space Greg KH
2009-02-11 0:24 ` [patch 13/56] shm: fix shmctl(SHM_INFO) lockup with !CONFIG_SHMEM Greg KH
2009-02-11 0:24 ` [patch 14/56] sound: usb-audio: handle wMaxPacketSize for FIXED_ENDPOINT devices Greg KH
2009-02-11 0:24 ` [patch 15/56] wait: prevent exclusive waiter starvation Greg KH
2009-02-11 0:24 ` [patch 16/56] x86: APIC: enable workaround on AMD Fam10h CPUs Greg KH
2009-02-11 0:24 ` [patch 17/56] ieee1394: ohci1394: increase AT req. retries, fix ack_busy_X from Panasonic camcorders and others Greg KH
2009-02-11 0:24 ` [patch 18/56] firewire: ohci: " Greg KH
2009-02-11 0:24 ` [patch 19/56] firewire: sbp2: fix DMA mapping leak on the failure path Greg KH
2009-02-11 0:24 ` [patch 20/56] firewire: sbp2: add workarounds for 2nd and 3rd generation iPods Greg KH
2009-02-11 0:24 ` [patch 21/56] ieee1394: " Greg KH
2009-02-11 0:25 ` [patch 22/56] 8250_pci: add support for netmos 9835 IBM devices Greg KH
2009-02-11 0:25 ` [patch 23/56] ACPICA: Fix table entry truncation calculation Greg KH
2009-02-11 0:25 ` [patch 24/56] ACPI: disable ACPI cleanly when bad RSDP found Greg KH
2009-02-11 0:25 ` [patch 25/56] ACPI: proc_dir_entry video/VGA already registered Greg KH
2009-02-11 0:25 ` [patch 26/56] ACPI: Skip the first two elements in the _BCL package Greg KH
2009-02-11 0:25 ` [patch 27/56] Add support for 8-port RS-232 MIC-3620 from advantech Greg KH
2009-02-11 0:25 ` [patch 28/56] ALSA: hda - Add missing COEF initialization for ALC887 Greg KH
2009-02-11 0:25 ` [patch 29/56] ALSA: hda - Add missing initialization for ALC272 Greg KH
2009-02-11 0:25 ` [patch 30/56] ALSA: hda - Add quirk for FSC Amilo Xi2550 Greg KH
2009-02-11 0:25 ` [patch 31/56] PCI: properly clean up ASPM link state on device remove Greg KH
2009-02-11 0:25 ` [patch 32/56] PCI: return error on failure to read PCI ROMs Greg KH
2009-02-11 0:25 ` Greg KH [this message]
2009-02-11 0:25 ` [patch 34/56] seq_file: fix big-enough lseek() + read() Greg KH
2009-02-11 0:25 ` [patch 35/56] serial: set correct baud_base for Oxford Semiconductor Ltd EXSYS EX-41092 Dual 16950 Serial adapter Greg KH
2009-02-11 0:25 ` [patch 36/56] elf core dump: fix get_user use Greg KH
2009-02-11 0:25 ` [patch 37/56] XFS: set b_error from bio error in xfs_buf_bio_end_io Greg KH
2009-02-11 0:25 ` [patch 38/56] Add a reference to sunrpc in svc_addsock Greg KH
2009-02-11 0:25 ` [patch 39/56] mm: remove UP version of lru_add_drain_all() Greg KH
2009-02-11 0:25 ` [patch 40/56] Revert "vt: fix background color on line feed" Greg KH
2009-02-11 0:25 ` [patch 41/56] md: Dont try to set an array to read-auto if it is already in that state Greg KH
2009-02-11 0:25 ` [patch 42/56] md: Allow metadata_version to be updated for externally managed metadata Greg KH
2009-02-11 0:25 ` [patch 43/56] ipw2200: fix scanning while associated Greg KH
2009-02-11 0:25 ` [patch 44/56] hso: rfkill type should be WWAN Greg KH
2009-02-11 0:25 ` [patch 45/56] dm mpath: avoid attempting to activate null path Greg KH
2009-02-11 0:25 ` [patch 46/56] ACPICA: Copy dynamically loaded tables to local buffer Greg KH
2009-02-11 0:25 ` [patch 47/56] ACPICA: Add function to dereference returned reference objects Greg KH
2009-02-11 0:25 ` [patch 48/56] ACPI: dont load acpi_cpufreq if acpi=off Greg KH
2009-02-11 0:25 ` [patch 49/56] ACPI: video: Fix reversed brightness behavior on ThinkPad SL series Greg KH
2009-02-11 0:25 ` [patch 50/56] Revert USB: option: add Pantech cards Greg KH
2009-02-11 0:25 ` [patch 51/56] USB: new id for ti_usb_3410_5052 driver Greg KH
2009-02-11 0:26 ` [patch 52/56] USB: option: New mobile broadband modems to be supported Greg KH
2009-02-11 0:26 ` [patch 53/56] USB: two more usb ids for ti_usb_3410_5052 Greg KH
2009-02-11 0:26 ` [patch 54/56] USB: usb-storage: add Pentax to the bad-vendor list Greg KH
2009-02-11 0:26 ` [patch 55/56] sctp: Fix another socket race during accept/peeloff Greg KH
2009-02-11 0:26 ` [patch 56/56] genirq: NULL struct irq_descs member name in dynamic_irq_cleanup() Greg KH
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=20090211002524.GH14660@kroah.com \
--to=gregkh@suse.de \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=cavokz@gmail.com \
--cc=cebbert@redhat.com \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=ebiederm@xmission.com \
--cc=eteo@redhat.com \
--cc=jake@lwn.net \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkrufky@linuxtv.org \
--cc=pjt@google.com \
--cc=rbranco@la.checkpoint.com \
--cc=rdunlap@xenotime.net \
--cc=reviews@ml.cw.f00f.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=w@1wt.eu \
--cc=zwane@arm.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).