Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 7 insertions, 1 deletions

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index a271c87c4472..baa663e69388 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -12,6 +12,7 @@
 
 #include <linux/module.h>
 #include <linux/kobject.h>
+#include <linux/kallsyms.h>
 #include <linux/namei.h>
 #include <linux/poll.h>
 #include <linux/list.h>
@@ -86,7 +87,12 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
          * The code works fine with PAGE_SIZE return but it's likely to
          * indicate truncated result or overflow in normal use cases.
          */
-        BUG_ON(count >= (ssize_t)PAGE_SIZE);
+        if (count >= (ssize_t)PAGE_SIZE) {
+                print_symbol("fill_read_buffer: %s returned bad count\n",
+                        (unsigned long)ops->show);
+                /* Try to struggle along */
+                count = PAGE_SIZE - 1;
+        }
         if (count >= 0) {
                 buffer->needs_read_fill = 0;
                 buffer->count = count;